diff --git a/lib/ace/mode/behaviour/xquery.js b/lib/ace/mode/behaviour/xquery.js
index 1c77217a..f9bfb3f9 100644
--- a/lib/ace/mode/behaviour/xquery.js
+++ b/lib/ace/mode/behaviour/xquery.js
@@ -60,6 +60,8 @@ function hasType(token, type) {
             var iterator = new TokenIterator(session, position.row, position.column);
             var token = iterator.getCurrentToken();
             var atCursor = false;
+            var state = JSON.parse(state).pop();
+            if ((token && token.value === '>') || state !== "StartTag") return;
             if (!token || !hasType(token, 'meta.tag') && !(hasType(token, 'text') && token.value.match('/'))){
                 do {
                     token = iterator.stepBackward();