diff --git a/src/calibre/gui2/device.py b/src/calibre/gui2/device.py
index 298e541730..2cbecc134c 100644
--- a/src/calibre/gui2/device.py
+++ b/src/calibre/gui2/device.py
@@ -1160,6 +1160,14 @@ class DeviceMixin(object): # {{{
                 ), bad)
             d.exec_()
 
+    def upload_dirtied_booklists(self):
+        '''
+        Upload metadata to device.
+        '''
+        plugboards = self.library_view.model().db.prefs.get('plugboards', {})
+        self.device_manager.sync_booklists(Dispatcher(lambda x: x),
+                                           self.booklists(), plugboards)
+
     def upload_booklists(self):
         '''
         Upload metadata to device.
diff --git a/src/calibre/gui2/init.py b/src/calibre/gui2/init.py
index 9119a8da77..80f1f1c2cf 100644
--- a/src/calibre/gui2/init.py
+++ b/src/calibre/gui2/init.py
@@ -44,13 +44,13 @@ class LibraryViewMixin(object): # {{{
             for view in (self.library_view, self.memory_view, self.card_a_view, self.card_b_view):
                 getattr(view, func)(*args)
 
-        self.memory_view.connect_dirtied_signal(self.upload_booklists)
+        self.memory_view.connect_dirtied_signal(self.upload_dirtied_booklists)
         self.memory_view.connect_upload_collections_signal(
                                     func=self.upload_collections, oncard=None)
-        self.card_a_view.connect_dirtied_signal(self.upload_booklists)
+        self.card_a_view.connect_dirtied_signal(self.upload_dirtied_booklists)
         self.card_a_view.connect_upload_collections_signal(
                                     func=self.upload_collections, oncard='carda')
-        self.card_b_view.connect_dirtied_signal(self.upload_booklists)
+        self.card_b_view.connect_dirtied_signal(self.upload_dirtied_booklists)
         self.card_b_view.connect_upload_collections_signal(
                                     func=self.upload_collections, oncard='cardb')
         self.book_on_device(None, reset=True)