diff --git a/deluge/ui/console/modes/alltorrents.py b/deluge/ui/console/modes/alltorrents.py
index 617be0f01..5ded8404a 100644
--- a/deluge/ui/console/modes/alltorrents.py
+++ b/deluge/ui/console/modes/alltorrents.py
@@ -171,7 +171,8 @@ DEFAULT_PREFS = {
     "uploaded_width":13,
     "owner_width":10,
     "ignore_duplicate_lines": False,
-    "move_selection": True
+    "move_selection": True,
+    "third_tab_lists_all": False
 }
 
 column_pref_names = ["queue","name","size","state",
diff --git a/deluge/ui/console/modes/legacy.py b/deluge/ui/console/modes/legacy.py
index a09a427d2..46b5842ae 100644
--- a/deluge/ui/console/modes/legacy.py
+++ b/deluge/ui/console/modes/legacy.py
@@ -57,8 +57,7 @@ import re
 LINES_BUFFER_SIZE = 5000
 INPUT_HISTORY_SIZE = 500
 
-AUTOCOMPLETE_MAX_TORRENTS = 20
-AUTOCOMPLETE_MAX_TORRENTS_WITH_PATTERN = 10
+AUTOCOMPLETE_MAX_TORRENTS = 15
 
 class Legacy(BaseMode):
     def __init__(self, stdscr, console_config, encoding=None):
diff --git a/deluge/ui/console/modes/preference_panes.py b/deluge/ui/console/modes/preference_panes.py
index 0dfea2340..fa3c30586 100644
--- a/deluge/ui/console/modes/preference_panes.py
+++ b/deluge/ui/console/modes/preference_panes.py
@@ -313,7 +313,9 @@ class InterfacePane(BasePane):
         self.add_header("General")
         self.add_checked_input("ignore_duplicate_lines","Do not store duplicate input in history",parent.console_config["ignore_duplicate_lines"])
         self.add_checked_input("move_selection","Move selection when moving torrents in the queue",parent.console_config["move_selection"])
-        self.add_header("Columns To Display")
+        self.add_checked_input("third_tab_lists_all","Third tab lists all remaining torrents in legacy mode",parent.console_config["third_tab_lists_all"])
+
+        self.add_header("Columns To Display", True)
         for cpn in deluge.ui.console.modes.alltorrents.column_pref_names:
             pn = "show_%s"%cpn
             self.add_checked_input(pn,