diff --git a/common/content/buffer.js b/common/content/buffer.js
index c14c599d..594854cb 100644
--- a/common/content/buffer.js
+++ b/common/content/buffer.js
@@ -1641,8 +1641,8 @@ function Marks() //{{{
     return {
 
         /**
-         * Add a named for the current buffer, at its current position. If
-         * mark matches [A-Z], it's considered a URL mark, and will jump to
+         * Add a named mark for the current buffer, at its current position.
+         * If mark matches [A-Z], it's considered a URL mark, and will jump to
          * the same position at the same URL no matter what buffer it's
          * selected from. If it matches [a-z'"], it's a local mark, and can
          * only be recalled from a buffer with a matching URL.
diff --git a/common/content/ui.js b/common/content/ui.js
index 5cd2cc92..44061a55 100644
--- a/common/content/ui.js
+++ b/common/content/ui.js
@@ -267,7 +267,6 @@ function CommandLine() //{{{
             substring = substring.substr(value.length);
             this.removeSubstring = substring;
 
-            // highlight="Preview" won't work in the editor.
             let node = util.xmlToDom(<span highlight="Preview">{substring}</span>,
                 document);
             let start = this.caret;
@@ -1074,8 +1073,6 @@ function CommandLine() //{{{
             }
             else if (event.type == "input")
             {
-                if (completions)
-                    completions.previewClear();
                 this.resetCompletions();
                 liberator.triggerCallback("change", currentExtendedMode, command);
             }
@@ -1434,7 +1431,10 @@ function CommandLine() //{{{
         {
             autocompleteTimer.reset();
             if (completions)
-                completions.reset();
+            {
+                completions.wildIndex = -1;
+                completions.previewClear();
+            }
             if (history)
                 history.reset();
         }