diff --git a/Windows/MainWindow.cpp b/Windows/MainWindow.cpp
index 331b6a8c1d..f8b8cdd694 100644
--- a/Windows/MainWindow.cpp
+++ b/Windows/MainWindow.cpp
@@ -866,7 +866,6 @@ namespace MainWindow
 
 		case WM_CLOSE:
 			InputDevice::StopPolling();
-			MainThread_Stop();
 			WindowsRawInput::Shutdown();
 			return DefWindowProc(hWnd,message,wParam,lParam);
 
diff --git a/Windows/main.cpp b/Windows/main.cpp
index 03dbf883cb..0e9259b93d 100644
--- a/Windows/main.cpp
+++ b/Windows/main.cpp
@@ -571,10 +571,8 @@ int WINAPI WinMain(HINSTANCE _hInstance, HINSTANCE hPrevInstance, LPSTR szCmdLin
 			break;
 		}
 
-		if (!TranslateAccelerator(wnd, accel, &msg))
-		{
-			if (!DialogManager::IsDialogMessage(&msg))
-			{
+		if (!TranslateAccelerator(wnd, accel, &msg)) {
+			if (!DialogManager::IsDialogMessage(&msg)) {
 				//and finally translate and dispatch
 				TranslateMessage(&msg);
 				DispatchMessage(&msg);
@@ -582,6 +580,8 @@ int WINAPI WinMain(HINSTANCE _hInstance, HINSTANCE hPrevInstance, LPSTR szCmdLin
 		}
 	}
 
+	MainThread_Stop();
+
 	VFSShutdown();
 
 	InputDevice::StopPolling();