diff --git a/gfx/drivers/gdi_gfx.c b/gfx/drivers/gdi_gfx.c
index 6927592898..84a5fce764 100644
--- a/gfx/drivers/gdi_gfx.c
+++ b/gfx/drivers/gdi_gfx.c
@@ -332,11 +332,11 @@ static bool gdi_gfx_frame(void *data, const void *frame,
    if (msg)
       font_driver_render_msg(NULL, msg, NULL);
 
-   InvalidateRect(hwnd, NULL, true);
+   InvalidateRect(hwnd, NULL, false);
 
    video_context_driver_update_window_title();
 
-   video_context_driver_swap_buffers();
+   //video_context_driver_swap_buffers();
 
    return true;
 }
diff --git a/menu/drivers_display/menu_display_gdi.c b/menu/drivers_display/menu_display_gdi.c
index 18c804c22d..1a49da97a3 100644
--- a/menu/drivers_display/menu_display_gdi.c
+++ b/menu/drivers_display/menu_display_gdi.c
@@ -25,6 +25,10 @@
 
 #include "../menu_display.h"
 
+#if defined(_WIN32) && !defined(_XBOX)
+#include "../common/win32_common.h"
+#endif
+
 static void *menu_display_gdi_get_default_mvp(void)
 {
    return NULL;
@@ -55,11 +59,25 @@ static void menu_display_gdi_viewport(void *data)
 
 static void menu_display_gdi_restore_clear_color(void)
 {
+   /*HBRUSH brush = CreateSolidBrush(GetSysColor(COLOR_WINDOW));
+   RECT rect;
+   HWND hwnd = win32_get_window();
+   HDC hdc = GetDC(hwnd);
+
+   GetClientRect(hwnd, &rect);
+
+   FillRect(hdc, &rect, brush);
+
+   DeleteObject(brush);
+
+   ReleaseDC(hwnd, hdc);*/
 }
 
 static void menu_display_gdi_clear_color(menu_display_ctx_clearcolor_t *clearcolor)
 {
    (void)clearcolor;
+
+   menu_display_gdi_restore_clear_color();
 }
 
 static bool menu_display_gdi_font_init_first(