diff --git a/src/calibre/gui2/search_box.py b/src/calibre/gui2/search_box.py
index f5b3649e27..40c9c34587 100644
--- a/src/calibre/gui2/search_box.py
+++ b/src/calibre/gui2/search_box.py
@@ -374,6 +374,8 @@ class SearchBoxMixin(object): # {{{
     def highlight_only_clicked(self, state):
         config['highlight_search_matches'] = not config['highlight_search_matches']
         self.set_highlight_only_button_icon()
+        self.search.do_search()
+        self.focus_to_library()
 
     def set_highlight_only_button_icon(self):
         if config['highlight_search_matches']: