diff --git a/src/PageView.py b/src/PageView.py
index 543686509..e4f96bfe8 100644
--- a/src/PageView.py
+++ b/src/PageView.py
@@ -1008,7 +1008,7 @@ class ListView(BookMarkView):
             return
 
     def change_db(self, db):
-        self._cleanup_callbacks()
+        self._change_db(db)
         for sig in self.signal_map:
             self.callman.add_db_signal(sig, self.signal_map[sig])
         self.bookmarks.update_bookmarks(self.get_bookmarks())
diff --git a/src/gui/dbguielement.py b/src/gui/dbguielement.py
index 1a281e857..16dc25804 100644
--- a/src/gui/dbguielement.py
+++ b/src/gui/dbguielement.py
@@ -84,6 +84,8 @@ class DbGUIElement(object):
         Remove all db callbacks. 
         This is done automatically on destruction of the object, but is
         normally needed earlier, calling this method does so.
+        Use _change_db method if you need to remove the callbacks because the
+        database has chaned
         """
         database = self.callman.database
         if database.is_open():