2 files changed, 16 insertions, 2 deletions

diff --git a/apps/gui/gwps.c b/apps/gui/gwps.c
index 7c9bbc63d2..b84027c61c 100644
--- a/apps/gui/gwps.c
+++ b/apps/gui/gwps.c
@@ -106,9 +106,16 @@ long gui_wps_show(void)
     }
 #ifdef HAVE_LCD_COLOR
     gui_wps[SCREEN_MAIN].data->old_backdrop = lcd_get_backdrop();
-    if (gui_wps[SCREEN_MAIN].data->has_backdrop) {
+    if (gui_wps[SCREEN_MAIN].data->has_backdrop)
+    {
         lcd_set_backdrop(&wps_backdrop[0][0]);
     }
+    else
+    {
+        /* wps has no backdrop, so clear it in case we're switching wps */
+        lcd_set_backdrop(gui_wps[SCREEN_MAIN].data->old_backdrop);
+    }
+
 #endif
 #endif
 
@@ -555,6 +562,9 @@ long gui_wps_show(void)
                 if (main_menu())
                     return true;
 #ifdef HAVE_LCD_COLOR
+                if(global_settings.backdrop_file[0] == 0)
+                    gui_wps[SCREEN_MAIN].data->old_backdrop = NULL;
+
                 if (gui_wps[SCREEN_MAIN].data->has_backdrop)
                     lcd_set_backdrop(&wps_backdrop[0][0]);
 #endif
diff --git a/apps/tree.c b/apps/tree.c
index 435ea8880a..6141a000bd 100644
--- a/apps/tree.c
+++ b/apps/tree.c
@@ -889,7 +889,11 @@ static bool dirbrowse(void)
             if (gui_wps_show() == SYS_USB_CONNECTED)
                 reload_dir = true;
 #ifdef HAVE_LCD_COLOR
-            lcd_set_backdrop(old_backdrop);
+            /* check if the backdrop hasn't been cleared */
+            if(global_settings.backdrop_file[0])
+                lcd_set_backdrop(old_backdrop);
+            else
+                lcd_set_backdrop(NULL);
 #endif
 #ifdef HAVE_HOTSWAP
             else