diff --git a/Windows/MainWindow.cpp b/Windows/MainWindow.cpp
index de53f40e83..26d195bca8 100644
--- a/Windows/MainWindow.cpp
+++ b/Windows/MainWindow.cpp
@@ -572,7 +572,7 @@ namespace MainWindow
 				double now = real_time_now();
 				if ((now - lastMouseDown) < 0.001 * GetDoubleClickTime()) {
 					if (!g_Config.bShowTouchControls && GetUIState() == UISTATE_INGAME) {
-						PostMessage(hwndMain, WM_USER_TOGGLE_FULLSCREEN, 0, 0);
+						SendToggleFullscreen(!g_Config.bFullScreen);
 					}
 					lastMouseDown = 0.0;
 				} else {
@@ -800,7 +800,7 @@ namespace MainWindow
 			break;
 
 		case WM_USER_TOGGLE_FULLSCREEN:
-			ToggleFullscreen(hwndMain, !g_Config.bFullScreen);
+			ToggleFullscreen(hwndMain, wParam ? true : false);
 			break;
 
 		case WM_INPUT:
@@ -952,4 +952,8 @@ namespace MainWindow
 		}
 	}
 
+	void SendToggleFullscreen(bool fullscreen) {
+		PostMessage(hwndMain, WM_USER_TOGGLE_FULLSCREEN, fullscreen, 0);
+	}
+
 }  // namespace
diff --git a/Windows/MainWindow.h b/Windows/MainWindow.h
index 3d25b09953..294993081a 100644
--- a/Windows/MainWindow.h
+++ b/Windows/MainWindow.h
@@ -63,6 +63,7 @@ namespace MainWindow
 	HINSTANCE GetHInstance();
 	HWND GetDisplayHWND();
 	void ToggleFullscreen(HWND hWnd, bool goingFullscreen);
+	void SendToggleFullscreen(bool fullscreen);  // To be used off-thread
 	void ToggleDebugConsoleVisibility();
 	void SetInternalResolution(int res = -1);
 	void SetWindowSize(int zoom);
diff --git a/Windows/MainWindowMenu.cpp b/Windows/MainWindowMenu.cpp
index 85d57a7997..051f9da9e3 100644
--- a/Windows/MainWindowMenu.cpp
+++ b/Windows/MainWindowMenu.cpp
@@ -831,7 +831,7 @@ namespace MainWindow {
 			break;
 
 		case ID_OPTIONS_FULLSCREEN:
-			PostMessage(hWnd, WM_USER_TOGGLE_FULLSCREEN, 0, 0);
+			SendToggleFullscreen(!g_Config.bFullScreen);
 			break;
 
 		case ID_OPTIONS_VERTEXCACHE:
diff --git a/Windows/WindowsHost.cpp b/Windows/WindowsHost.cpp
index 09f5f73525..5afe390411 100644
--- a/Windows/WindowsHost.cpp
+++ b/Windows/WindowsHost.cpp
@@ -330,7 +330,7 @@ bool WindowsHost::CreateDesktopShortcut(std::string argumentPath, std::string ga
 }
 
 void WindowsHost::GoFullscreen(bool viewFullscreen) {
-	MainWindow::ToggleFullscreen(mainWindow_, viewFullscreen);
+	MainWindow::SendToggleFullscreen(viewFullscreen);
 }
 
 void WindowsHost::ToggleDebugConsoleVisibility() {