diff --git a/common/content/hints.js b/common/content/hints.js
index 4e60ef5f..c9b8957f 100644
--- a/common/content/hints.js
+++ b/common/content/hints.js
@@ -587,6 +587,7 @@ function Hints() //{{{
                 {
                     promptHighlight: "Normal",
                     completer: function (context) {
+                        context.compare = function () 0;
                         context.completions = [[k, v.prompt] for ([k, v] in Iterator(hintModes))];
                     },
                     onChange: function () { modes.pop() }
diff --git a/common/content/ui.js b/common/content/ui.js
index cdb93b51..67010ac0 100644
--- a/common/content/ui.js
+++ b/common/content/ui.js
@@ -415,7 +415,7 @@ function CommandLine() //{{{
             statusline.updateProgress("match " + (completions.selected + 1) + " of " + completions.items.length);
     });
 
-    var autocompleteTimer = new Timer(201, 300, function autocompleteTell(tabPressed) {
+    var autocompleteTimer = new Timer(201, 500, function autocompleteTell(tabPressed) {
         if (events.feedingKeys || !completions)
             return;
         completions.complete(true, false);
@@ -596,12 +596,12 @@ function CommandLine() //{{{
         {
             win.scrollTo(0, doc.height);
         }
-        commandline.updateMorePrompt();
 
         win.focus();
 
         startHints = false;
         modes.set(modes.COMMAND_LINE, modes.OUTPUT_MULTILINE);
+        commandline.updateMorePrompt();
     }
 
     function autosizeMultilineInputWidget()