diff --git a/Windows/MainWindow.cpp b/Windows/MainWindow.cpp
index ba507b916f..95edbb155f 100644
--- a/Windows/MainWindow.cpp
+++ b/Windows/MainWindow.cpp
@@ -859,8 +859,8 @@ namespace MainWindow
 			break;
 
 		case WM_CLOSE:
-			EmuThread_Stop();
 			InputDevice::StopPolling();
+			EmuThread_Stop();
 			WindowsRawInput::Shutdown();
 
 			return DefWindowProc(hWnd,message,wParam,lParam);