diff --git a/src/calibre/gui2/dialogs/saved_search_editor.py b/src/calibre/gui2/dialogs/saved_search_editor.py
index 63f3de2cc4..9716397152 100644
--- a/src/calibre/gui2/dialogs/saved_search_editor.py
+++ b/src/calibre/gui2/dialogs/saved_search_editor.py
@@ -37,6 +37,7 @@ class SavedSearchEditor(QDialog, Ui_SavedSearchEditor):
     def populate_search_list(self):
         self.search_name_box.blockSignals(True)
         self.search_name_box.clear()
+        self.search_name_box.addItem('')
         for name in sorted(self.searches.keys(), key=sort_key):
             self.search_name_box.addItem(name)
         self.search_names = set([icu_lower(n) for n in self.searches.keys()])
@@ -88,6 +89,7 @@ class SavedSearchEditor(QDialog, Ui_SavedSearchEditor):
         if self.current_search_name in self.searches:
             self.searches[new_search_name] = self.searches[self.current_search_name]
             del self.searches[self.current_search_name]
+            self.current_search_name = None
             self.populate_search_list()
             self.select_search(new_search_name)
         return True
diff --git a/src/calibre/gui2/dialogs/saved_search_editor.ui b/src/calibre/gui2/dialogs/saved_search_editor.ui
index af6d6f4d55..7ffa613015 100644
--- a/src/calibre/gui2/dialogs/saved_search_editor.ui
+++ b/src/calibre/gui2/dialogs/saved_search_editor.ui
@@ -123,7 +123,7 @@
      <item row="0" column="5">
       <widget class="QToolButton" name="add_search_button">
        <property name="toolTip">
-        <string>Add the new saved search</string>
+        <string>Add a new, empty saved search with the name entered</string>
        </property>
        <property name="text">
         <string>...</string>