diff --git a/ChangeLog b/ChangeLog
index b45867d22..525c4d6ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-01-09  Gary Burton <gary.burton@zen.co.uk>
+	* src/ManagedWindow.py: Close window only if it is already open. Possible
+	fix for bug #1510
+
 2008-01-08  Benny Malengier <benny.malengier@gramps-project.org>
             Peter Landgren <peter.talken2telia.com>
 	* src/DbManager.py: rename check, issue 1562, 1569
diff --git a/src/ManagedWindow.py b/src/ManagedWindow.py
index c787b7707..a2194efe1 100644
--- a/src/ManagedWindow.py
+++ b/src/ManagedWindow.py
@@ -454,9 +454,10 @@ class ManagedWindow:
 
         Takes care of closing children and removing itself from menu.
         """
-        self.uistate.gwm.close_track(self.track)
-        self.opened = False
-        self.parent_window.present()
+        if self.opened:
+            self.uistate.gwm.close_track(self.track)
+            self.opened = False
+            self.parent_window.present()
 
     def present(self):
         """