diff --git a/src/damaris/gui/DamarisGUI.py b/src/damaris/gui/DamarisGUI.py
index 3f851c5..b366cfb 100644
--- a/src/damaris/gui/DamarisGUI.py
+++ b/src/damaris/gui/DamarisGUI.py
@@ -333,6 +333,9 @@ class DamarisGUI:
         """
         expecting quit event for main application
         """
+        if self.state == DamarisGUI.Quit_State:
+            # quit already handled, e.g. window closed twice
+            return True
         if self.state in [ DamarisGUI.Edit_State, DamarisGUI.Quit_State ]:
             self.state = DamarisGUI.Quit_State
             # do a cleanup...