diff --git a/src/calibre/devices/cybook/driver.py b/src/calibre/devices/cybook/driver.py
index becb7912a9..c1a62fdbf3 100644
--- a/src/calibre/devices/cybook/driver.py
+++ b/src/calibre/devices/cybook/driver.py
@@ -65,8 +65,8 @@ class ORIZON(CYBOOK):
 
     BCD         = [0x319]
 
-    WINDOWS_MAIN_MEM = re.compile(r'CYBOOK_ORIZON__-FD')
-    WINDOWS_CARD_A_MEM = re.compile('CYBOOK_ORIZON__-SD')
+    WINDOWS_MAIN_MEM = re.compile(r'(CYBOOK_ORIZON__-FD)|(FILE-STOR_GADGET)')
+    WINDOWS_CARD_A_MEM = re.compile('(CYBOOK_ORIZON__-SD)|(FILE-STOR_GADGET)')
 
     EBOOK_DIR_MAIN = EBOOK_DIR_CARD_A = 'Digital Editions'
 
diff --git a/src/calibre/devices/eb600/driver.py b/src/calibre/devices/eb600/driver.py
index 4b3d4498c4..54d73d9c1d 100644
--- a/src/calibre/devices/eb600/driver.py
+++ b/src/calibre/devices/eb600/driver.py
@@ -229,7 +229,7 @@ class POCKETBOOK301(USBMS):
 
 class POCKETBOOK602(USBMS):
 
-    name = 'PocketBook Pro 602 Device Interface'
+    name = 'PocketBook Pro 602/902 Device Interface'
     description    = _('Communicate with the PocketBook 602 reader.')
     author         = 'Kovid Goyal'
     supported_platforms = ['windows', 'osx', 'linux']
@@ -244,5 +244,5 @@ class POCKETBOOK602(USBMS):
     BCD         = [0x0324]
 
     VENDOR_NAME = ''
-    WINDOWS_MAIN_MEM = WINDOWS_CARD_A_MEM = 'PB602'
+    WINDOWS_MAIN_MEM = WINDOWS_CARD_A_MEM = ['PB602', 'PB902']
 
diff --git a/src/calibre/gui2/search_box.py b/src/calibre/gui2/search_box.py
index 16c697a8fd..1832520cec 100644
--- a/src/calibre/gui2/search_box.py
+++ b/src/calibre/gui2/search_box.py
@@ -25,10 +25,6 @@ class SearchLineEdit(QLineEdit):
         self.key_pressed.emit(event)
         QLineEdit.keyPressEvent(self, event)
 
-    def mouseReleaseEvent(self, event):
-        QLineEdit.mouseReleaseEvent(self, event)
-        QLineEdit.selectAll(self)
-
     def dropEvent(self, ev):
         self.parent().normalize_state()
         return QLineEdit.dropEvent(self, ev)
@@ -71,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)