diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c
index 4ccee2188f..7c12d1bc2e 100644
--- a/menu/drivers/xmb.c
+++ b/menu/drivers/xmb.c
@@ -2684,6 +2684,23 @@ static void xmb_frame(void *data)
    menu_display_font_flush_block(xmb->font);
    menu_display_font_flush_block(xmb->font2);
 
+   if (xmb->savestate_thumbnail)
+      xmb_draw_thumbnail(xmb, &coord_white[0], width, height,
+            xmb->savestate_thumbnail_width, xmb->savestate_thumbnail_height,
+            xmb->savestate_thumbnail);
+   else if (xmb->thumbnail
+      && !string_is_equal(xmb_thumbnails_ident(), "OFF"))
+   {
+#ifdef XMB_DEBUG
+      RARCH_LOG("[XMB thumbnail] width: %.2f, height: %.2f\n", xmb->thumbnail_width, xmb->thumbnail_height);
+      RARCH_LOG("[XMB thumbnail] w: %.2f, h: %.2f\n", width, height);
+#endif
+
+      xmb_draw_thumbnail(xmb, &coord_white[0], width, height,
+            xmb->thumbnail_width, xmb->thumbnail_height,
+            xmb->thumbnail);
+   }
+
    if (menu_input_dialog_get_display_kb())
    {
       const char *str   = menu_input_dialog_get_buffer();
@@ -2719,22 +2736,6 @@ static void xmb_frame(void *data)
          width,
          height);
 
-   if (xmb->savestate_thumbnail)
-      xmb_draw_thumbnail(xmb, &coord_white[0], width, height,
-            xmb->savestate_thumbnail_width, xmb->savestate_thumbnail_height,
-            xmb->savestate_thumbnail);
-   else if (xmb->thumbnail
-      && !string_is_equal(xmb_thumbnails_ident(), "OFF"))
-   {
-#ifdef XMB_DEBUG
-      RARCH_LOG("[XMB thumbnail] width: %.2f, height: %.2f\n", xmb->thumbnail_width, xmb->thumbnail_height);
-      RARCH_LOG("[XMB thumbnail] w: %.2f, h: %.2f\n", width, height);
-#endif
-
-      xmb_draw_thumbnail(xmb, &coord_white[0], width, height,
-            xmb->thumbnail_width, xmb->thumbnail_height,
-            xmb->thumbnail);
-   }
 
    menu_display_unset_viewport();
 }