diff --git a/gfx/d3d/d3d.cpp b/gfx/d3d/d3d.cpp
index 0244e41045..766ed7306b 100644
--- a/gfx/d3d/d3d.cpp
+++ b/gfx/d3d/d3d.cpp
@@ -446,6 +446,9 @@ static void d3d_set_nonblock_state(void *data, bool state)
    d3d->video_info.vsync = !state;
 
    gfx_ctx_swap_interval(state ? 0 : 1);
+#ifndef _XBOX
+   d3d_restore();
+#endif
 }
 
 static bool d3d_alive(void *data)
diff --git a/gfx/drivers_context/d3d_ctx.cpp b/gfx/drivers_context/d3d_ctx.cpp
index faa0565593..a43e7c3b6c 100644
--- a/gfx/drivers_context/d3d_ctx.cpp
+++ b/gfx/drivers_context/d3d_ctx.cpp
@@ -297,8 +297,6 @@ static void gfx_ctx_d3d_swap_interval(void *data, unsigned interval)
       D3DPRESENT_INTERVAL_ONE : D3DPRESENT_INTERVAL_IMMEDIATE;
 
    d3d_set_render_state(d3d->dev, XBOX_PRESENTATIONINTERVAL, d3d_interval);
-#else
-   d3d_restore(d3d);
 #endif
 }