diff --git a/src/calibre/gui2/viewer/search.py b/src/calibre/gui2/viewer/search.py
index 5e8c42ebcd..cdd629aa45 100644
--- a/src/calibre/gui2/viewer/search.py
+++ b/src/calibre/gui2/viewer/search.py
@@ -322,9 +322,10 @@ class SearchPanel(QWidget):
         self.current_search = None
         searchable_text_for_name.cache_clear()
         self.spinner.stop()
-        # TODO: clear the results list
-        self.searcher = None
+        self.results.clear()
 
     def shutdown(self):
         self.search_tasks.put(None)
-        pass
+        self.spinner.stop()
+        self.current_search = None
+        self.searcher = None