diff --git a/src/Config.h b/src/Config.h
index b184f093..4d164739 100644
--- a/src/Config.h
+++ b/src/Config.h
@@ -30,7 +30,7 @@
 #define VER_LAMEXP_MINOR_LO					4
 #define VER_LAMEXP_TYPE						Alpha
 #define VER_LAMEXP_PATCH					12
-#define VER_LAMEXP_BUILD					851
+#define VER_LAMEXP_BUILD					852
 
 ///////////////////////////////////////////////////////////////////////////////
 // Tool versions (minimum expected versions!)
diff --git a/src/Global.cpp b/src/Global.cpp
index 2bb3f9a0..bdebebf4 100644
--- a/src/Global.cpp
+++ b/src/Global.cpp
@@ -808,7 +808,7 @@ static bool lamexp_event_filter(void *message, long *result)
 				{
 					app->closeAllWindows();
 					app->processEvents();
-					Sleep(0);
+					Sleep(8);
 				}
 			}
 		}
@@ -818,9 +818,13 @@ static bool lamexp_event_filter(void *message, long *result)
 		qWarning("WM_ENDSESSION message received!");
 		if(reinterpret_cast<MSG*>(message)->wParam == TRUE)
 		{
+			g_sessionIsEnding = true;
 			if(QApplication *app = reinterpret_cast<QApplication*>(QApplication::instance()))
 			{
 				app->quit();
+				app->processEvents();
+				lamexp_finalization();
+				exit(1);
 			}
 		}
 		*result = 0;