diff --git a/common/content/commandline.js b/common/content/commandline.js
index f2926ace..be7ea8ee 100644
--- a/common/content/commandline.js
+++ b/common/content/commandline.js
@@ -326,8 +326,8 @@ var CommandMode = Class("CommandMode", {
         if (this.complete)
             this.completions = CommandLine.Completions(commandline.widgets.active.command.inputField, this);
 
-        if (this.completions && command && options["autocomplete"].length && commandline.commandSession === this)
-            this.completions.complete(true, false);
+        if (this.completions && command && commandline.commandSession === this)
+            this.completions.autocompleteTimer.flush(true);
     },
 
     get holdFocus() this.widgets.active.command.inputField,
@@ -1139,7 +1139,8 @@ var CommandLine = Module("commandline", {
 
             if (show) {
                 this.itemList.reset();
-                this.itemList.visible = true;
+                if (this.haveType("list"))
+                    this.itemList.visible = true;
                 this.selected = null;
                 this.wildIndex = 0;
             }
diff --git a/common/modules/addons.jsm b/common/modules/addons.jsm
index ca3dde2c..6b29b72e 100644
--- a/common/modules/addons.jsm
+++ b/common/modules/addons.jsm
@@ -454,8 +454,8 @@ var Addons = Module("addons", {
             context.title = ["Extension"];
             context.anchored = false;
             context.keys = { text: "name", description: "description", icon: "iconURL" },
-            context.incomplete = true;
             context.generate = function () {
+                context.incomplete = true;
                 AddonManager.getAddonsByTypes(types || ["extension"], function (addons) {
                     context.incomplete = false;
                     context.completions = addons;