diff --git a/apps/misc.c b/apps/misc.c
index f7fa794979..ea4726d0c2 100644
--- a/apps/misc.c
+++ b/apps/misc.c
@@ -373,10 +373,13 @@ static bool clean_shutdown(enum shutdown_type sd_type,
         int audio_stat = audio_status();
 #endif
 
+        FOR_NB_SCREENS(i)
+            viewportmanager_theme_enable(i, true, NULL);
+        clear_screen_buffer(false);
         FOR_NB_SCREENS(i)
         {
-            screens[i].clear_display();
             screens[i].update();
+            screens[i].scroll_stop();
         }
 
         if (batt_safe)
@@ -387,6 +390,8 @@ static bool clean_shutdown(enum shutdown_type sd_type,
             {
                 cancel_shutdown();
                 splash(HZ, ID2P(LANG_TAGCACHE_BUSY));
+                FOR_NB_SCREENS(i)
+                    viewportmanager_theme_undo(i, false);
                 return false;
             }
 #endif