diff --git a/dgl/src/Window.cpp b/dgl/src/Window.cpp
index 4380c474..c0b01a1f 100644
--- a/dgl/src/Window.cpp
+++ b/dgl/src/Window.cpp
@@ -319,11 +319,16 @@ public:
         XFlush(xDisplay);
 #endif
 
-        if (yesNo && fFirstInit)
+        if (yesNo)
         {
-            fApp._oneShown();
-            fFirstInit = false;
+            if (fFirstInit)
+            {
+                fApp._oneShown();
+                fFirstInit = false;
+            }
         }
+        else if (fModal.enabled)
+            exec_fini();
     }
 
     // -------------------------------------------------------------------