diff --git a/ueforth/common/grf_test.fs b/ueforth/common/grf_test.fs
index 3c33498..d9ba93d 100755
--- a/ueforth/common/grf_test.fs
+++ b/ueforth/common/grf_test.fs
@@ -33,7 +33,6 @@ internals
       ." CHAR: " last-char . cr
     then
 )
-
     0 to color 0 0 width height box
     g{
       vertical-flip
@@ -42,7 +41,6 @@ internals
       0 0 640 480 box
       $ff7700 to color
       0 0 400 300 box
-
       g{
         mouse-x mouse-y screen>g translate
         LEFT-BUTTON pressed? if $ccccff else $ffccff then to color
diff --git a/ueforth/windows/grf.fs b/ueforth/windows/grf.fs
index c74d3c5..b0d178b 100644
--- a/ueforth/windows/grf.fs
+++ b/ueforth/windows/grf.fs
@@ -65,10 +65,6 @@ cell allocate throw to backbuffer
 ;
 
 : GrfWindowProc { hwnd msg w l }
-  WM_QUIT msg = if
-    FINISHED to event
-    0 exit
-  then
   WM_DESTROY msg = if
     0 PostQuitMessage
     0 exit
@@ -165,6 +161,10 @@ also windows
   event FINISHED = if exit then
   IDLE to event
   msgbuf NULL 0 0 PM_REMOVE PeekMessageA if
+    WM_QUIT msgbuf ->message @ = if
+      FINISHED to event
+      exit
+    then
     msgbuf TranslateMessage drop
     msgbuf DispatchMessageA drop
   then