diff --git a/src/dd.c b/src/dd.c
index 5006c63..7b36970 100644
--- a/src/dd.c
+++ b/src/dd.c
@@ -495,7 +495,7 @@ HRESULT dd_SetDisplayMode(DWORD dwWidth, DWORD dwHeight, DWORD dwBPP, DWORD dwFl
 
     g_ddraw->render.run = TRUE;
 
-    BOOL lock_mouse = g_ddraw->locked || g_ddraw->fullscreen;
+    BOOL lock_mouse = (g_ddraw->locked || g_ddraw->fullscreen) && !(dwFlags & SDM_LEAVE_FULLSCREEN);
     mouse_unlock();
 
     memset(&g_ddraw->render.mode, 0, sizeof(DEVMODE));
diff --git a/src/utils.c b/src/utils.c
index f9ffa94..6c808fe 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -310,7 +310,7 @@ void util_toggle_fullscreen()
         }
 
         dd_SetDisplayMode(g_ddraw->width, g_ddraw->height, g_ddraw->bpp, SDM_LEAVE_FULLSCREEN);
-        mouse_lock();
+        //mouse_lock();
     }
 }