1 files changed, 15 insertions, 0 deletions

diff --git a/apps/misc.c b/apps/misc.c
index 69c62da238..6e2bf32770 100644
--- a/apps/misc.c
+++ b/apps/misc.c
@@ -56,6 +56,7 @@
 #include "playlist.h"
 #include "yesno.h"
 #include "viewport.h"
+#include "list.h"
 
 #include "debug.h"
 
@@ -1078,11 +1079,25 @@ static enum current_activity
 static int current_activity_top = 0;
 void push_current_activity(enum current_activity screen)
 {
+#if HAVE_LCD_BITMAP
+    int i;
+#endif
     current_activity[current_activity_top++] = screen;
+#if HAVE_LCD_BITMAP
+    FOR_NB_SCREENS(i)
+        skinlist_set_cfg(i, NULL);
+#endif
 }
 void pop_current_activity(void)
 {
+#if HAVE_LCD_BITMAP
+    int i;
+#endif
     current_activity_top--;
+#if HAVE_LCD_BITMAP
+    FOR_NB_SCREENS(i)
+        skinlist_set_cfg(i, NULL);
+#endif
 }
 enum current_activity get_current_activity(void)
 {