diff --git a/360/frontend-xdk/menu.cpp b/360/frontend-xdk/menu.cpp
index a377843683..50a0833e54 100644
--- a/360/frontend-xdk/menu.cpp
+++ b/360/frontend-xdk/menu.cpp
@@ -1155,7 +1155,6 @@ bool rmenu_iterate(void)
 
    if(preinit)
    {
-      device_ptr->block_swap = true;
       g_extern.console.rmenu.input_loop = INPUT_LOOP_MENU;
       g_extern.draw_menu = true;
       preinit = false;
@@ -1213,7 +1212,6 @@ deinit:
       SET_TIMER_EXPIRATION(0, 30);
    }
 
-   device_ptr->block_swap = false;
    g_extern.console.rmenu.state.ingame_menu.enable = false;
    g_extern.draw_menu = false;
    preinit = true;
diff --git a/xdk/xdk_d3d.cpp b/xdk/xdk_d3d.cpp
index d01ca1d474..76bf3070d1 100644
--- a/xdk/xdk_d3d.cpp
+++ b/xdk/xdk_d3d.cpp
@@ -612,7 +612,6 @@ static bool xdk_d3d_frame(void *data, const void *frame,
 #ifdef HAVE_FBO
    D3DSurface* pRenderTarget0;
 #endif
-   bool menu_enabled = g_extern.draw_menu;
    bool fps_enable = g_extern.console.rmenu.state.msg_fps.enable;
 #ifdef _XBOX1
    unsigned flicker_filter = g_extern.console.screen.state.flicker_filter.value;
@@ -812,16 +811,15 @@ static bool xdk_d3d_frame(void *data, const void *frame,
    if (msg)
       d3d->font_ctx->render_msg_place(d3d, msg_width, msg_height, 0.0f, 0, msg);
 
-   if(!d3d->block_swap)
-      gfx_ctx_xdk_swap_buffers();
-
 #ifdef _XBOX360
-   if(menu_enabled)
+   if(g_extern.draw_menu)
    {
 	   app.Render();
 	   XuiTimersRun();
    }
+   else
 #endif
+      gfx_ctx_xdk_swap_buffers();
 
    return true;
 }
diff --git a/xdk/xdk_d3d.h b/xdk/xdk_d3d.h
index 06c4a95706..fe7841863c 100644
--- a/xdk/xdk_d3d.h
+++ b/xdk/xdk_d3d.h
@@ -53,7 +53,6 @@ typedef struct DrawVerticeFormats
 typedef struct xdk_d3d_video
 {
    const gfx_ctx_driver_t *ctx_driver;
-   bool block_swap;
 #ifdef HAVE_FBO
    bool fbo_inited;
 #endif