diff --git a/src/calibre/gui2/shortcuts.py b/src/calibre/gui2/shortcuts.py
index 5cdaf2da8a..a245db9f03 100644
--- a/src/calibre/gui2/shortcuts.py
+++ b/src/calibre/gui2/shortcuts.py
@@ -260,11 +260,11 @@ class ShortcutConfig(QWidget):
         self.view.setModel(model)
         self.delegate = Delegate()
         self.view.setItemDelegate(self.delegate)
-        self.delegate.sizeHintChanged.connect(self.scrollTo)
+        self.delegate.sizeHintChanged.connect(self.scrollTo,
+                type=Qt.QueuedConnection)
 
     def scrollTo(self, index):
-        self.view.scrollTo(index)
-
+        self.view.scrollTo(index, self.view.EnsureVisible)
 
     @property
     def is_editing(self):