diff --git a/Windows/MainWindow.cpp b/Windows/MainWindow.cpp
index de6b09baed..65e6e5385e 100644
--- a/Windows/MainWindow.cpp
+++ b/Windows/MainWindow.cpp
@@ -968,8 +968,8 @@ namespace MainWindow
 			break;
 
 		case WM_CLOSE:
-			MainThread_Stop();
 			InputDevice::StopPolling();
+			MainThread_Stop();
 			WindowsRawInput::Shutdown();
 			return DefWindowProc(hWnd,message,wParam,lParam);