diff --git a/ChangeLog b/ChangeLog
index 7d5035d14..3b13d1e36 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,5 @@
 2006-04-25  Don Allingham  <don@gramps-project.org>
-	* src/ViewManager.py: new config changes
+	* src/ViewManager.py: new config changes, handle exception
 	* src/GrampsCfg.py: new config changes
 	* src/Config/gen_schema_keys.py: new config changes
 	* src/gramps_main.py: new config changes
diff --git a/src/ViewManager.py b/src/ViewManager.py
index fbe80b415..3f02ce735 100644
--- a/src/ViewManager.py
+++ b/src/ViewManager.py
@@ -424,7 +424,10 @@ class ViewManager:
         GrampsDisplay.url( const.url_mailinglist)
 
     def preferences_activate(self, obj):
-        GrampsCfg.GrampsPreferences(self.uistate)
+        try:
+            GrampsCfg.GrampsPreferences(self.uistate)
+        except Errors.WindowActiveError:
+            pass
 
     def report_bug_activate(self, obj):
         import GrampsDisplay