diff --git a/src/calibre/gui2/device.py b/src/calibre/gui2/device.py
index 2fb721242f..f6e24fdb39 100644
--- a/src/calibre/gui2/device.py
+++ b/src/calibre/gui2/device.py
@@ -1075,15 +1075,17 @@ class DeviceMixin(object):  # {{{
         else:
             self.device_connected = None
             self.status_bar.device_disconnected()
+            dviews = (self.memory_view, self.card_a_view, self.card_b_view)
+            for v in dviews:
+                v.save_state()
             if self.current_view() != self.library_view:
                 self.book_details.reset_info()
             self.location_manager.update_devices()
             self.bars_manager.update_bars(reveal_bar=True)
             self.library_view.set_device_connected(self.device_connected)
             # Empty any device view information
-            self.memory_view.set_database([])
-            self.card_a_view.set_database([])
-            self.card_b_view.set_database([])
+            for v in dviews:
+                v.set_database([])
             self.refresh_ondevice()
         device_signals.device_connection_changed.emit(connected)
 
diff --git a/src/calibre/gui2/library/views.py b/src/calibre/gui2/library/views.py
index 7f35dcef0e..36cb82b373 100644
--- a/src/calibre/gui2/library/views.py
+++ b/src/calibre/gui2/library/views.py
@@ -1114,7 +1114,6 @@ class DeviceBooksView(BooksView):  # {{{
         self._model.resize_rows.connect(self.do_row_sizing,
                                                  type=Qt.QueuedConnection)
         self.can_add_columns = False
-        self.columns_resized = False
         self.resize_on_select = False
         self.rating_delegate = None
         for i in range(10):
@@ -1163,10 +1162,6 @@ class DeviceBooksView(BooksView):  # {{{
         self._model.set_database(db)
         self.restore_state()
 
-    def resizeColumnsToContents(self):
-        QTableView.resizeColumnsToContents(self)
-        self.columns_resized = True
-
     def connect_dirtied_signal(self, slot):
         self._model.booklist_dirtied.connect(slot)