Index: trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java	(revision 11658)
+++ trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java	(revision 11659)
@@ -147,5 +147,7 @@
     @Override
     public void historyDataSetCleared(HistoryDataSet source) {
-        closeAction.run();
+        if (isVisible()) {
+            closeAction.run();
+        }
     }
 
@@ -187,5 +189,7 @@
         @Override
         public void windowClosing(WindowEvent e) {
-            closeAction.run();
+            if (isVisible()) {
+                closeAction.run();
+            }
         }
     }