diff --git a/common/content/commandline.js b/common/content/commandline.js
index ede78db6..8d31e16a 100644
--- a/common/content/commandline.js
+++ b/common/content/commandline.js
@@ -983,6 +983,8 @@ var CommandLine = Module("commandline", {
             this.itemList = commandline.completionList;
             this.itemList.setItems(this.context);
 
+            dactyl.registerObserver("events.doneFeeding", this.closure.onDoneFeeding, true);
+
             this.autocompleteTimer = Timer(200, 500, function autocompleteTell(tabPressed) {
                 if (!events.feedingKeys && options["autocomplete"].length) {
                     this.complete(true, false);
@@ -1001,6 +1003,10 @@ var CommandLine = Module("commandline", {
             this.itemList.visible = false;
         },
 
+        onDoneFeeding: function onDoneFeeding() {
+            this.autocompleteTimer.flush(true);
+        },
+
         UP: {},
         DOWN: {},
         PAGE_UP: {},
diff --git a/common/content/events.js b/common/content/events.js
index 4851a8b4..f25528c2 100644
--- a/common/content/events.js
+++ b/common/content/events.js
@@ -558,6 +558,7 @@ var Events = Module("events", {
             this.feedingKeys = wasFeeding;
             if (quiet)
                 commandline.quiet = wasQuiet;
+            dactyl.triggerObserver("events.doneFeeding");
         }
         return true;
     },