diff --git a/src/dd.c b/src/dd.c
index 9aa286f756..b6d94a66b0 100644
--- a/src/dd.c
+++ b/src/dd.c
@@ -1031,7 +1031,8 @@ HRESULT dd_SetDisplayMode(DWORD dwWidth, DWORD dwHeight, DWORD dwBPP, DWORD dwFl
         if (g_config.remove_menu && GetMenu(g_ddraw.hwnd))
             SetMenu(g_ddraw.hwnd, NULL);
 
-        if (g_ddraw.last_msg_pull_tick &&
+        if (!g_config.fix_not_responding &&
+            g_ddraw.last_msg_pull_tick &&
             g_ddraw.last_msg_pull_tick + 1000 < timeGetTime() &&
             GetCurrentThreadId() == g_ddraw.gui_thread_id && 
             !IsWine())