diff --git a/src/main/java/de/neemann/gui/ClosingWindowListener.java b/src/main/java/de/neemann/gui/ClosingWindowListener.java
index 8a7883e0f..4e7a1c28f 100644
--- a/src/main/java/de/neemann/gui/ClosingWindowListener.java
+++ b/src/main/java/de/neemann/gui/ClosingWindowListener.java
@@ -116,8 +116,10 @@ public class ClosingWindowListener extends WindowAdapter {
             if (r == JOptionPane.YES_OPTION || r == JOptionPane.NO_OPTION) {
                 if (r == JOptionPane.YES_OPTION) {
                     guiCloser.saveChanges();
-                }
-                guiCloser.closeGUI();
+                    if (!guiCloser.isStateChanged())
+                        guiCloser.closeGUI();
+                } else
+                    guiCloser.closeGUI();
             }
         } else {
             guiCloser.closeGUI();