diff --git a/Windows/RawInput.cpp b/Windows/RawInput.cpp
index 92a5faa249..343a1479d1 100644
--- a/Windows/RawInput.cpp
+++ b/Windows/RawInput.cpp
@@ -119,7 +119,7 @@ namespace WindowsRawInput {
 		}
 
 		if (g_Config.bEscapeExitsEmulator && raw->data.keyboard.VKey == VK_ESCAPE) {
-			DestroyWindow(MainWindow::GetHWND());
+			PostMessage(MainWindow::GetHWND(), WM_CLOSE, 0, 0);
 			return;
 		}
 
diff --git a/Windows/WndMainWindow.cpp b/Windows/WndMainWindow.cpp
index 03a87151b4..b209a71e08 100644
--- a/Windows/WndMainWindow.cpp
+++ b/Windows/WndMainWindow.cpp
@@ -1316,7 +1316,7 @@ namespace MainWindow
 					break;
 
 				case ID_FILE_EXIT:
-					DestroyWindow(hWnd);
+					PostMessage(hwndMain, WM_CLOSE, 0, 0);
 					break;
 
 				case ID_DEBUG_RUNONLOAD: