diff --git a/lib/ace/mode/behaviour/xquery.js b/lib/ace/mode/behaviour/xquery.js
index 5df04cd2..1c77217a 100644
--- a/lib/ace/mode/behaviour/xquery.js
+++ b/lib/ace/mode/behaviour/xquery.js
@@ -67,7 +67,8 @@ function hasType(token, type) {
             } else {
                 atCursor = true;
             }
-            if (!token || !hasType(token, 'meta.tag') || iterator.stepBackward().value.match('/')) {
+            var previous = iterator.stepBackward();
+            if (!token || !hasType(token, 'meta.tag') || (previous !== null && previous.value.match('/'))) {
                 return
             }
             var tag = token.value.substring(1);