diff --git a/build/js/live-editor.tooltips.js b/build/js/live-editor.tooltips.js
index c701eae52..ba5eb998d 100644
--- a/build/js/live-editor.tooltips.js
+++ b/build/js/live-editor.tooltips.js
@@ -1432,7 +1432,10 @@ window.TooltipEngine = Backbone.View.extend({
 
         this.requestTooltipDefaultCallback = (function () {
             //Fallback to hiding
-            ScratchpadAutosuggest.enableLiveCompletion(this.enabled);
+            // We are disabling autosuggest for now until issue #408 is fixed
+            // We may also consider doing A/B tests with partial lists of
+            // commands in the autocomplete to new programmers
+            ScratchpadAutosuggest.enableLiveCompletion(false);
             if (this.currentTooltip && this.currentTooltip.$el) {
                 this.currentTooltip.$el.hide();
                 this.currentTooltip = undefined;
diff --git a/js/ui/tooltip-engine.js b/js/ui/tooltip-engine.js
index fe5d7c4e7..41ab50e83 100644
--- a/js/ui/tooltip-engine.js
+++ b/js/ui/tooltip-engine.js
@@ -111,7 +111,10 @@ window.TooltipEngine = Backbone.View.extend({
 
 
         this.requestTooltipDefaultCallback = function() {  //Fallback to hiding
-            ScratchpadAutosuggest.enableLiveCompletion(this.enabled);
+            // We are disabling autosuggest for now until issue #408 is fixed
+            // We may also consider doing A/B tests with partial lists of
+            // commands in the autocomplete to new programmers
+            ScratchpadAutosuggest.enableLiveCompletion(false);
             if (this.currentTooltip && this.currentTooltip.$el) {
                 this.currentTooltip.$el.hide();
                 this.currentTooltip = undefined;