diff --git a/src/calibre/gui2/actions/add.py b/src/calibre/gui2/actions/add.py
index c94dfc2f44..18f0ed9668 100644
--- a/src/calibre/gui2/actions/add.py
+++ b/src/calibre/gui2/actions/add.py
@@ -487,4 +487,4 @@ class AddAction(InterfaceAction):
         if ok_paths:
             from calibre.gui2.add import Adder
             callback = partial(self._add_from_device_adder, on_card=None, model=view.model())
-            Adder(ok_paths, db=None, parent=self.gui, callback=callback, pool=self.gui.spare_pool())
+            Adder(ok_paths, db=self.gui.current_db, parent=self.gui, callback=callback, pool=self.gui.spare_pool())
diff --git a/src/calibre/gui2/add.py b/src/calibre/gui2/add.py
index 159b385111..3b7e4bc253 100644
--- a/src/calibre/gui2/add.py
+++ b/src/calibre/gui2/add.py
@@ -430,6 +430,3 @@ class Adder(QObject):
     @property
     def number_of_books_added(self):
         return len(self.added_book_ids)
-
-# TODO: Test direct add of books to device
-# TODO: Test adding form device to library