diff --git a/gfx/drivers/gdi_gfx.c b/gfx/drivers/gdi_gfx.c
index 023b536446..af297d301a 100644
--- a/gfx/drivers/gdi_gfx.c
+++ b/gfx/drivers/gdi_gfx.c
@@ -252,9 +252,6 @@ static bool gdi_gfx_frame(void *data, const void *frame,
    menu_driver_ctl(RARCH_MENU_CTL_FRAME, NULL);
 #endif
 
-   if (msg)
-      font_driver_render_msg(NULL, msg, NULL);
-
    if (draw)
    {
       HDC winDC = GetDC(hwnd);
@@ -281,7 +278,7 @@ static bool gdi_gfx_frame(void *data, const void *frame,
       ZeroMemory(&info, sizeof(BITMAPINFO));
       info.bmiHeader.biBitCount = gdi_video_bits;
       info.bmiHeader.biWidth = width;
-      info.bmiHeader.biHeight = height;
+      info.bmiHeader.biHeight = -height;
       info.bmiHeader.biPlanes = 1;
       info.bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
       info.bmiHeader.biSizeImage = pitch * height;
@@ -337,6 +334,9 @@ static bool gdi_gfx_frame(void *data, const void *frame,
       ReleaseDC(hwnd, winDC);
    }
 
+   if (msg)
+      font_driver_render_msg(NULL, msg, NULL);
+
    //InvalidateRect(hwnd, NULL, true);
 
    video_context_driver_update_window_title();