diff --git a/ChangeLog b/ChangeLog
index f5037ee96..2f5dadba9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 2006-01-02  Martin Hawlisch  <Martin.Hawlisch@gmx.de>
 	* src/PedView.py: Show marriage data
+	* src/ViewManager.py (post_load): Request interface rebuild after upgrading the database 
 
 2006-01-01 Eero Tamminen <eerot@sf>
 	* doc/gramps.1.in: nroff and a couple of typo fixes
diff --git a/src/ViewManager.py b/src/ViewManager.py
index e4ae8da51..32e9bb859 100644
--- a/src/ViewManager.py
+++ b/src/ViewManager.py
@@ -714,7 +714,6 @@ class ViewManager:
         return self.post_load(name,callback)
 
     def post_load(self,name,callback=None):
-        self.state.db.request_rebuild()
         if not self.state.db.version_supported():
             raise Errors.FileVersionError(
                     "The database version is not supported by this "
@@ -739,6 +738,8 @@ class ViewManager:
                 callback(_('Upgrading database...'))
             self.state.db.gramps_upgrade()
 
+        self.state.db.request_rebuild()
+
         GrampsKeys.save_last_file(name)
     
         self.relationship = self.RelClass(self.state.db)