diff --git a/src/video/win32_v.cpp b/src/video/win32_v.cpp
index 934acc0611..270af12e81 100644
--- a/src/video/win32_v.cpp
+++ b/src/video/win32_v.cpp
@@ -384,6 +384,10 @@ static void PaintWindowThread(void *)
 	_draw_mutex->BeginCritical();
 	_draw_mutex->SendSignal();
 
+	/* Do our best to make sure the main thread is the one that
+	 * gets the signal, and not our wait below. */
+	Sleep(0);
+
 	/* Now wait for the first thing to draw! */
 	_draw_mutex->WaitForSignal();