diff --git a/src/calibre/gui2/layout.py b/src/calibre/gui2/layout.py
index fd42bfe671..aaaf1b0267 100644
--- a/src/calibre/gui2/layout.py
+++ b/src/calibre/gui2/layout.py
@@ -182,7 +182,7 @@ class SearchBar(QWidget): # {{{
         l.addWidget(self.search_button)
         self.search_button.setSizePolicy(QSizePolicy.Minimum,
                 QSizePolicy.Minimum)
-        self.search_button.clicked.connect(parent.search.do_search)
+        self.search_button.clicked.connect(parent.do_search_button)
         self.search_button.setToolTip(
             _('Do Quick Search (you can also press the Enter key)'))
 
diff --git a/src/calibre/gui2/search_box.py b/src/calibre/gui2/search_box.py
index 4d598a3bbb..fbb52e5781 100644
--- a/src/calibre/gui2/search_box.py
+++ b/src/calibre/gui2/search_box.py
@@ -352,6 +352,10 @@ class SearchBoxMixin(object):
         if d.exec_() == QDialog.Accepted:
             self.search.set_search_string(d.search_string())
 
+    def do_search_button(self):
+        self.search.do_search()
+        self.focus_to_library()
+
     def focus_to_library(self):
         self.current_view().setFocus(Qt.OtherFocusReason)