diff --git a/src/calibre/gui2/dialogs/tag_list_editor.py b/src/calibre/gui2/dialogs/tag_list_editor.py
index 9d1c99416e..542ccde92d 100644
--- a/src/calibre/gui2/dialogs/tag_list_editor.py
+++ b/src/calibre/gui2/dialogs/tag_list_editor.py
@@ -341,9 +341,11 @@ class TagListEditor(QDialog, Ui_TagListEditor):
 
         if select_item is not None:
             self.table.setCurrentItem(select_item)
+            self.table.setFocus(True)
             self.start_find_pos = select_item.row()
         else:
             self.table.setCurrentCell(0, 0)
+            self.search_box.setFocus()
             self.start_find_pos = -1
         self.table.blockSignals(False)