diff --git a/node_modules/ace/lib/ace/ext/emmet.js b/node_modules/ace/lib/ace/ext/emmet.js
index 6276ce98..64358420 100644
--- a/node_modules/ace/lib/ace/ext/emmet.js
+++ b/node_modules/ace/lib/ace/ext/emmet.js
@@ -351,6 +351,10 @@ exports.runEmmetCommand = function runEmmetCommand(editor) {
         if (this.action == "expand_abbreviation_with_tab") {
             if (!editor.selection.isEmpty())
                 return false;
+            var pos = editor.selection.lead;
+            var token = editor.session.getTokenAt(pos.row, pos.column);
+            if (token && /\btag\b/.test(token.type))
+                return false;
         }
         
         if (this.action == "wrap_with_abbreviation") {
@@ -360,11 +364,6 @@ exports.runEmmetCommand = function runEmmetCommand(editor) {
             }, 0);
         }
         
-        var pos = editor.selection.lead;
-        var token = editor.session.getTokenAt(pos.row, pos.column);
-        if (token && /\btag\b/.test(token.type))
-            return false;
-        
         var result = actions.run(this.action, editorProxy);
     } catch(e) {
         if (!emmet) {