diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index f27bfedaf..09b25bdf2 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,5 +1,6 @@
 2006-05-16  Martin Hawlisch  <Martin.Hawlisch@gmx.de>
-	* src/DataViews/_PedigreeView.py: Add navigation-arrows to the tree
+	* src/DataViews/_PedigreeView.py: Add navigation-arrows to the tree;
+	work around bug in database-changed signals
 
 2006-05-15  Alex Roitman  <shura@gramps-project.org>
 	* src/GrampsDb/_GrampsXMLDB.py: Use callback, call parent's
diff --git a/gramps2/src/DataViews/_PedigreeView.py b/gramps2/src/DataViews/_PedigreeView.py
index e271b7f91..31d169dec 100644
--- a/gramps2/src/DataViews/_PedigreeView.py
+++ b/gramps2/src/DataViews/_PedigreeView.py
@@ -605,6 +605,10 @@ class PedigreeView(PageView.PersonNavView):
             self.notebook.set_current_page(self.force_size-2)
 
     def rebuild_trees(self,person_handle):
+        if self.db != self.dbstate.db:
+            print "UNRECOGNIZED DATABASES CHANGE DETECTED! TODO: Fix signals"
+            self.change_db(self.dbstate.db)
+            return
         person = None
         if person_handle:
             person = self.dbstate.db.get_person_from_handle( person_handle)