diff --git a/api/graphics2_win.cpp b/api/graphics2_win.cpp
index fa082310c2..375ebe3dc0 100644
--- a/api/graphics2_win.cpp
+++ b/api/graphics2_win.cpp
@@ -68,7 +68,6 @@ void boinc_close_window_and_quit(const char* p) {
     if (window) {
         DestroyWindow(window);
     }
-    SendMessage(window, WM_QUIT, 0, 0);
 }
 
 void SetupPixelFormat(HDC win_dc) {
diff --git a/checkin_notes b/checkin_notes
index d1d9b68e77..7c036b90ff 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -6324,6 +6324,14 @@ Rom    23 Oct 2012
     clientscr/
         screensaver_x11.cpp
 
+Rom    24 Oct 2012
+    - API: Remove the call to SendMessage(WM_QUIT, ...) after destroying the window.
+        There is no guarantee what order the event queue will be processed in and if
+        WM_QUIT is processed before WM_DESTROY something might linger around.
+        
+    api/
+        graphics2_win.cpp
+
 David  23 Oct 2012
     - server: add stage_file to project setup; add error checking to stage_file