diff --git a/src/calibre/gui2/tag_browser/ui.py b/src/calibre/gui2/tag_browser/ui.py
index d47895de41..5a7bf11aae 100644
--- a/src/calibre/gui2/tag_browser/ui.py
+++ b/src/calibre/gui2/tag_browser/ui.py
@@ -447,12 +447,18 @@ class TagBrowserBar(QWidget):  # {{{
             l.addWidget(self.item_search, 10)
             l.addWidget(self.search_button)
             self.item_search.setFocus(Qt.OtherFocusReason)
+            self.toggle_search_button.setVisible(False)
+            self.search_button.setVisible(True)
+            self.item_search.setVisible(True)
         else:
             l.addWidget(self.alter_tb)
             self.alter_tb.setToolButtonStyle(Qt.ToolButtonTextBesideIcon)
             l.addStretch(10)
             l.addStretch(10)
             l.addWidget(self.toggle_search_button)
+            self.toggle_search_button.setVisible(True)
+            self.search_button.setVisible(False)
+            self.item_search.setVisible(False)
 # }}}