diff --git a/src/msw/app.cpp b/src/msw/app.cpp
index 14d9ec6086..072874afb7 100644
--- a/src/msw/app.cpp
+++ b/src/msw/app.cpp
@@ -1287,10 +1287,15 @@ int wxApp::GetComCtl32Version()
 
 void wxExit()
 {
-    wxLogError(_("Fatal error: exiting"));
-
-    wxApp::CleanUp();
-    exit(0);
+    if ( wxTheApp )
+    {
+        wxTheApp->ExitMainLoop();
+    }
+    else
+    {
+        // what else can we do?
+        exit(-1);
+    }
 }
 
 // Yield to incoming messages