diff --git a/lib/ace/snippets.js b/lib/ace/snippets.js
index d061dbba..ee1a5498 100644
--- a/lib/ace/snippets.js
+++ b/lib/ace/snippets.js
@@ -809,6 +809,10 @@ var TabstopManager = function(editor) {
     this.keyboardHandler = new HashHandler();
     this.keyboardHandler.bindKeys({
         "Tab": function(ed) {
+            if (exports.snippetManager && exports.snippetManager.expandWithTab(ed)) {
+                return;
+            }
+
             ed.tabstopManager.tabNext(1);
         },
         "Shift-Tab": function(ed) {