diff --git a/content/buffer.js b/content/buffer.js
index 2da5b4ef..aa6f3142 100644
--- a/content/buffer.js
+++ b/content/buffer.js
@@ -142,6 +142,9 @@ liberator.Buffer = function () //{{{
     ////////////////////// OPTIONS /////////////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////{{{
 
+    // override this stupid pref, because otherwise zoom is lost after switching tabs
+    liberator.options.setPref("browser.zoom.siteSpecific", false);
+
     liberator.options.add(["fullscreen", "fs"],
         "Show the current window fullscreen",
         "boolean", false,
diff --git a/content/ui.js b/content/ui.js
index fbdb1c13..af007b10 100644
--- a/content/ui.js
+++ b/content/ui.js
@@ -998,9 +998,17 @@ liberator.CommandLine = function () //{{{
 
             // liberator.log(compl);
 
+            if (completionIndex >= 0 && completionIndex < compl.length && completionIndex < completions.length)
+            {
+                if (compl[completionIndex][0] != completions[completionIndex][0])
+                    completionIndex = -1;
+            }
+            else
+                completionIndex = -1;
+
             completions = compl;
             completionlist.show(compl);
-            completionIndex = -1;
+            completionlist.selectItem(completionIndex);
 
             var command = this.getCommand();
             completionPrefix = command.substring(0, commandWidget.selectionStart);