diff --git a/resources/default_tweaks.py b/resources/default_tweaks.py
index 3bba5ecca5..b096cd1d65 100644
--- a/resources/default_tweaks.py
+++ b/resources/default_tweaks.py
@@ -522,5 +522,5 @@ enable_multicharacters_in_tag_browser = True
 # completions you will now have to press Tab to select one before pressing
 # Enter. Which technique you prefer will depend on the state of metadata in
 # your library and your personal editing style.
-preselect_first_completion = False
+preselect_first_completion = True
 
diff --git a/src/calibre/gui2/complete2.py b/src/calibre/gui2/complete2.py
index 603177498d..eb28c38881 100644
--- a/src/calibre/gui2/complete2.py
+++ b/src/calibre/gui2/complete2.py
@@ -193,8 +193,8 @@ class Completer(QListView): # {{{
             if key in (Qt.Key_PageUp, Qt.Key_PageDown):
                 # Let the list view handle these keys
                 return False
-            if key in (Qt.Key_Tab, Qt.Key_Backtab, Qt.Key_Up, Qt.Key_Down):
-                self.next_match(previous=key in (Qt.Key_Backtab, Qt.Key_Up))
+            if key in (Qt.Key_Up, Qt.Key_Down):
+                self.next_match(previous=key == Qt.Key_Up)
                 e.accept()
                 return True
             # Send to widget