3 files changed, 7 insertions, 4 deletions

diff --git a/apps/gui/option_select.c b/apps/gui/option_select.c
index ca16b5b05f..918335d6cd 100644
--- a/apps/gui/option_select.c
+++ b/apps/gui/option_select.c
@@ -574,7 +574,7 @@ bool option_screen(const struct settings_list *setting,
         if (function == sound_get_fn(SOUND_VOLUME))
             global_status.last_volume_change = current_tick;
     }
-    pop_current_activity();
+    pop_current_activity(ACTIVITY_REFRESH_NOW);
     return false;
 }
 
diff --git a/apps/gui/quickscreen.c b/apps/gui/quickscreen.c
index 141eb1a16b..1f32dca544 100644
--- a/apps/gui/quickscreen.c
+++ b/apps/gui/quickscreen.c
@@ -406,10 +406,13 @@ static int gui_syncquickscreen_run(struct gui_quickscreen * qs, int button_enter
     {   /* stop scrolling before exiting */
         for (int j = 0; j < QUICKSCREEN_ITEM_COUNT; j++)
             screens[i].scroll_stop_viewport(&vps[i][j]);
-        viewportmanager_theme_undo(i, true);
+        viewportmanager_theme_undo(i, !(ret & QUICKSCREEN_GOTO_SHORTCUTS_MENU));
     }
 
-    pop_current_activity();
+    if (ret & QUICKSCREEN_GOTO_SHORTCUTS_MENU) /* Eliminate flashing of parent during */
+        pop_current_activity(ACTIVITY_REFRESH_DEFERRED);   /* transition to Shortcuts */
+    else
+        pop_current_activity(ACTIVITY_REFRESH_NOW);
 
     return ret;
 }
diff --git a/apps/gui/usb_screen.c b/apps/gui/usb_screen.c
index 31321ec005..05e60067e0 100644
--- a/apps/gui/usb_screen.c
+++ b/apps/gui/usb_screen.c
@@ -315,5 +315,5 @@ void gui_usb_screen_run(bool early_usb)
         viewportmanager_theme_undo(i, false);
     }
 
-    pop_current_activity();
+    pop_current_activity(ACTIVITY_REFRESH_NOW);
 }