diff --git a/lib/ace/editor.js b/lib/ace/editor.js
index 85d7076b..af6690ff 100644
--- a/lib/ace/editor.js
+++ b/lib/ace/editor.js
@@ -509,8 +509,11 @@ var Editor = function(renderer, session) {
             this.$updateHighlightActiveLine();
         }
 
-        if (this.$highlightSelectedWord)
-            this.session.getMode().highlightSelection(this);
+        if (this.$highlightSelectedWord && !this.$wordHighlightTimer)
+            this.$wordHighlightTimer = setTimeout(function(self) {
+                self.session.$mode.highlightSelection(self);
+                self.$wordHighlightTimer = null;
+            }, 30, this);
     };
 
     /**