diff --git a/lib/ace/editor.js b/lib/ace/editor.js
index 78c7c18d..0d4e9df2 100644
--- a/lib/ace/editor.js
+++ b/lib/ace/editor.js
@@ -539,11 +539,14 @@ var Editor = function(renderer, session) {
             var iterator = new TokenIterator(self.session, pos.row, pos.column);
             var token = iterator.getCurrentToken();
             
-            if (!token || token.type.indexOf('tag-name') === -1) {
+            if (!token || !/\b(?:tag-open|tag-name)/.test(token.type)) {
                 session.removeMarker(session.$tagHighlight);
                 session.$tagHighlight = null;
                 return;
             }
+            
+            if (token.type.indexOf("tag-open") != -1)
+                token = iterator.stepForward();
 
             var tag = token.value;
             var depth = 0;