diff --git a/src/calibre/gui2/layout.py b/src/calibre/gui2/layout.py
index be1928f17b..fb7e6c1e10 100644
--- a/src/calibre/gui2/layout.py
+++ b/src/calibre/gui2/layout.py
@@ -181,6 +181,7 @@ class SearchBar(QWidget):  # {{{
         x = QToolButton(self)
         x.setCursor(Qt.PointingHandCursor)
         x.setText(_('Virtual library'))
+        x.setAutoRaise(True)
         x.setIcon(QIcon(I('lt.png')))
         x.setObjectName("virtual_library")
         x.setToolButtonStyle(Qt.ToolButtonTextBesideIcon)
@@ -222,6 +223,7 @@ class SearchBar(QWidget):  # {{{
         self.search_button = QToolButton()
         self.search_button.setToolButtonStyle(Qt.ToolButtonTextOnly)
         self.search_button.setText(_('Search'))
+        self.search_button.setAutoRaise(True)
         self.search_button.setCursor(Qt.PointingHandCursor)
         l.addWidget(self.search_button)
         self.search_button.setSizePolicy(QSizePolicy.Minimum,
@@ -242,6 +244,7 @@ class SearchBar(QWidget):  # {{{
         x.setVisible(tweaks['show_saved_search_box'])
 
         x = parent.copy_search_button = QToolButton(self)
+        x.setAutoRaise(True)
         x.setCursor(Qt.PointingHandCursor)
         x.setIcon(QIcon(I("search_copy_saved.png")))
         x.setObjectName("copy_search_button")
@@ -250,6 +253,7 @@ class SearchBar(QWidget):  # {{{
         x.setVisible(tweaks['show_saved_search_box'])
 
         x = parent.save_search_button = RightClickButton(self)
+        x.setAutoRaise(True)
         x.setCursor(Qt.PointingHandCursor)
         x.setIcon(QIcon(I("search_add_saved.png")))
         x.setObjectName("save_search_button")
@@ -262,6 +266,7 @@ class SearchBar(QWidget):  # {{{
         ))
         x.setCursor(Qt.PointingHandCursor)
         x.setPopupMode(x.InstantPopup)
+        x.setAutoRaise(True)
         x.setIcon(QIcon(I("bookmarks.png")))
         l.addWidget(x)
         x.setVisible(not tweaks['show_saved_search_box'])
diff --git a/src/calibre/gui2/tag_browser/ui.py b/src/calibre/gui2/tag_browser/ui.py
index 541137dc35..d634667aff 100644
--- a/src/calibre/gui2/tag_browser/ui.py
+++ b/src/calibre/gui2/tag_browser/ui.py
@@ -384,6 +384,7 @@ class TagBrowserWidget(QWidget):  # {{{
         ac.triggered.connect(self.search_button.click)
 
         self.expand_button = QToolButton()
+        self.expand_button.setAutoRaise(True)
         self.expand_button.setCursor(Qt.PointingHandCursor)
         self.expand_button.setText('▸')
         self.expand_button.setToolTip(_('Collapse all categories'))
@@ -433,9 +434,11 @@ class TagBrowserWidget(QWidget):  # {{{
         search_layout.insertWidget(1, b)
         b.setChecked(gprefs.get('tag browser search box visible', False))
         b.setToolTip(_('Search for items in the Tag browser'))
+        b.setAutoRaise(True)
         b.toggled.connect(self.update_search_state)
         parent.alter_tb = self.alter_tb = l = QToolButton(parent)
         l.setToolButtonStyle(Qt.ToolButtonTextBesideIcon)
+        l.setAutoRaise(True)
         l.setText(_('Alter Tag browser'))
         l.setCursor(Qt.PointingHandCursor)
         l.setPopupMode(l.InstantPopup)