diff --git a/src/calibre/gui2/search_box.py b/src/calibre/gui2/search_box.py
index 8038a0d545..1832520cec 100644
--- a/src/calibre/gui2/search_box.py
+++ b/src/calibre/gui2/search_box.py
@@ -67,6 +67,7 @@ class SearchBox2(QComboBox):
         c = self.line_edit.completer()
         c.setCompletionMode(c.PopupCompletion)
         c.highlighted[QString].connect(self.completer_used)
+        c.activated[QString].connect(self.history_selected)
 
         self.line_edit.key_pressed.connect(self.key_pressed, type=Qt.DirectConnection)
         self.activated.connect(self.history_selected)
diff --git a/src/calibre/gui2/viewer/main.py b/src/calibre/gui2/viewer/main.py
index 70fa99b4b6..7c19567804 100644
--- a/src/calibre/gui2/viewer/main.py
+++ b/src/calibre/gui2/viewer/main.py
@@ -253,6 +253,7 @@ class EbookViewer(MainWindow, Ui_EbookViewer):
         self.connect(self.vertical_scrollbar, SIGNAL('valueChanged(int)'),
                      lambda x: self.goto_page(x/100.))
         self.search.search.connect(self.find)
+        self.search.focus_to_library.connect(lambda: self.view.setFocus(Qt.OtherFocusReason))
         self.connect(self.toc, SIGNAL('clicked(QModelIndex)'), self.toc_clicked)
         self.connect(self.reference, SIGNAL('goto(PyQt_PyObject)'), self.goto)