diff --git a/common/content/commands.js b/common/content/commands.js
index d2682d54..5df3818e 100644
--- a/common/content/commands.js
+++ b/common/content/commands.js
@@ -923,7 +923,8 @@ function Commands() //{{{
                 [["-bang"], commandManager.OPTION_NOARG],
                 [["-count"], commandManager.OPTION_NOARG],
                 [["-complete"], commandManager.OPTION_STRING,
-                     function (arg) arg in completeOptionMap || /custom,\w+/.test(arg)]
+                     function (arg) arg in completeOptionMap || /custom,\w+/.test(arg),
+                     function (context) [[k, ''] for ([k, v] in Iterator(completeOptionMap))]]
             ],
             literal: 1,
             serial: function () [
diff --git a/common/content/modes.js b/common/content/modes.js
index fc4195c5..4f5d3de9 100644
--- a/common/content/modes.js
+++ b/common/content/modes.js
@@ -118,7 +118,7 @@ const modes = (function () //{{{
                 options.setPref("accessibility.browsewithcaret", false);
 
             statusline.updateUrl();
-            liberator.focusContent(false);
+            liberator.focusContent(true);
         }
     }