2 files changed, 14 insertions, 1 deletions

diff --git a/apps/gui/gwps.c b/apps/gui/gwps.c
index 5ffdf4e33f..5c68ac40b0 100644
--- a/apps/gui/gwps.c
+++ b/apps/gui/gwps.c
@@ -709,7 +709,20 @@ long gui_wps_show(void)
 
 #ifdef WPS_ID3
             case WPS_ID3:
+#ifdef HAVE_LCD_COLOR
+                lcd_set_backdrop(gui_wps[SCREEN_MAIN].data->old_backdrop);
+#endif
                 browse_id3();
+#ifdef HAVE_LCD_COLOR
+                if (gui_wps[SCREEN_MAIN].data->has_backdrop)
+                    lcd_set_backdrop(&wps_backdrop[0][0]);
+#endif
+#ifdef HAVE_LCD_BITMAP
+                FOR_NB_SCREENS(i)
+                {
+                    gui_wps_set_margin(&gui_wps[i]);
+                }
+#endif
                 restore = true;
                 break;
 #endif
diff --git a/apps/screens.c b/apps/screens.c
index 4c71667a91..540cde5499 100644
--- a/apps/screens.c
+++ b/apps/screens.c
@@ -983,7 +983,7 @@ bool browse_id3(void)
     char buf[64];
     const struct mp3entry* id3 = audio_current_track();
 #if defined(HAVE_LCD_BITMAP)
-    const int y_margin = lcd_getymargin();
+    const int y_margin = global_settings.statusbar ? STATUSBAR_HEIGHT : 0;
     const int line_height = font_get(FONT_UI)->height;
     const int rows = (LCD_HEIGHT - y_margin) / line_height;
     const bool show_scrollbar = global_settings.scrollbar