diff --git a/lib/ace/editor.js b/lib/ace/editor.js
index 57c6adb2..643bc217 100644
--- a/lib/ace/editor.js
+++ b/lib/ace/editor.js
@@ -554,7 +554,7 @@ var Editor = function(renderer, session) {
         setTimeout(function() {
             self.$highlightTagPending = false;
             
-            var pos = editor.getCursorPosition();
+            var pos = self.getCursorPosition();
             var iterator = new TokenIterator(self.session, pos.row, pos.column);
             var token = iterator.getCurrentToken();
             
@@ -729,6 +729,7 @@ var Editor = function(renderer, session) {
         }
 
         this.$highlightBrackets();
+        this.$highlightTags();
         this.$updateHighlightActiveLine();
         this._signal("changeSelection");
     };