diff --git a/content/bookmarks.js b/content/bookmarks.js
index 85340b9e..bd9661ad 100644
--- a/content/bookmarks.js
+++ b/content/bookmarks.js
@@ -114,7 +114,7 @@ function Bookmarks() //{{{
             bookmarks = [];
             this.__defineGetter__("bookmarks", function () bookmarks);
 
-            var folders = rootFolders.concat([]);
+            var folders = rootFolders.slice();
             var query = historyService.getNewQuery();
             var options = historyService.getNewQueryOptions();
             while (folders.length > 0)
diff --git a/content/ui.js b/content/ui.js
index b5c81a39..ebdaf4fb 100644
--- a/content/ui.js
+++ b/content/ui.js
@@ -755,6 +755,8 @@ function CommandLine() //{{{
                 return false;
             if (silent)
                 return false;
+            if (modes.main == modes.COMMAND_LINE)
+                return false;
 
             highlightGroup = highlightGroup || this.HL_NORMAL;
 
@@ -1206,6 +1208,8 @@ function CommandLine() //{{{
 
         updateMorePrompt: function updateMorePrompt(force, showHelp)
         {
+            if (modes.main == modes.COMMAND_LINE)
+                return;
             let win = multilineOutputWidget.contentWindow;
             function isScrollable() !win.scrollMaxY == 0;
             function atEnd() win.scrollY / win.scrollMaxY >= 1;