diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c
index 9ca34737ca7..8cb259673aa 100644
--- a/dlls/ddraw/ddraw.c
+++ b/dlls/ddraw/ddraw.c
@@ -452,7 +452,7 @@ void ddraw_destroy_swapchain(IDirectDrawImpl *ddraw)
         wined3d_device_uninit_gdi(ddraw->wined3d_device);
     }
 
-    ddraw->swapchain_window = NULL;
+    ddraw_set_swapchain_window(ddraw, NULL);
 
     TRACE("Swapchain destroyed.\n");
 }
@@ -2655,7 +2655,7 @@ static HRESULT ddraw_create_swapchain(IDirectDrawImpl *ddraw, IDirectDrawSurface
     }
 
     if (SUCCEEDED(hr))
-        ddraw->swapchain_window = ddraw->dest_window;
+        ddraw_set_swapchain_window(ddraw, ddraw->dest_window);
 
     return hr;
 }
diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h
index 0f2c6ab6423..f53c93f06bb 100644
--- a/dlls/ddraw/ddraw_private.h
+++ b/dlls/ddraw/ddraw_private.h
@@ -128,6 +128,13 @@ struct IDirectDrawImpl
 HRESULT ddraw_init(IDirectDrawImpl *ddraw, WINED3DDEVTYPE device_type) DECLSPEC_HIDDEN;
 void ddraw_destroy_swapchain(IDirectDrawImpl *ddraw) DECLSPEC_HIDDEN;
 
+static inline void ddraw_set_swapchain_window(struct IDirectDrawImpl *ddraw, HWND window)
+{
+    if (window == GetDesktopWindow())
+        window = NULL;
+    ddraw->swapchain_window = window;
+}
+
 /* Utility functions */
 void DDRAW_Convert_DDSCAPS_1_To_2(const DDSCAPS *pIn, DDSCAPS2 *pOut) DECLSPEC_HIDDEN;
 void DDRAW_Convert_DDDEVICEIDENTIFIER_2_To_1(const DDDEVICEIDENTIFIER2 *pIn, DDDEVICEIDENTIFIER *pOut) DECLSPEC_HIDDEN;
diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c
index 854ec3c0abb..864b3bae017 100644
--- a/dlls/ddraw/surface.c
+++ b/dlls/ddraw/surface.c
@@ -3952,12 +3952,12 @@ static HRESULT WINAPI ddraw_surface7_SetClipper(IDirectDrawSurface7 *iface,
         if (clipWindow)
         {
             wined3d_swapchain_set_window(This->ddraw->wined3d_swapchain, clipWindow);
-            This->ddraw->swapchain_window = clipWindow;
+            ddraw_set_swapchain_window(This->ddraw, clipWindow);
         }
         else
         {
             wined3d_swapchain_set_window(This->ddraw->wined3d_swapchain, This->ddraw->d3d_window);
-            This->ddraw->swapchain_window = This->ddraw->dest_window;
+            ddraw_set_swapchain_window(This->ddraw, This->ddraw->dest_window);
         }
     }