diff --git a/lib/ace/mode/behaviour/html.js b/lib/ace/mode/behaviour/html.js
index cc084ef2..e7a74cf9 100644
--- a/lib/ace/mode/behaviour/html.js
+++ b/lib/ace/mode/behaviour/html.js
@@ -59,8 +59,8 @@ var HtmlBehaviour = function () {
             var position = editor.getCursorPosition();
             var iterator = new TokenIterator(session, position.row, position.column);
             var token = iterator.getCurrentToken();
-            var ch = session.getLine(position.row)[position.column - 1];
-            if (!/[\w:."'\s]/.test(ch))
+
+            if (hasType(token, 'string') && iterator.getCurrentTokenColumn() + token.value.length > position.column)
                 return;
             var atCursor = false;
             if (!token || !hasType(token, 'meta.tag') && !(hasType(token, 'text') && token.value.match('/'))){