diff --git a/apps/gui/pitchscreen.c b/apps/gui/pitchscreen.c
index 5620de47e8..421ec04676 100644
--- a/apps/gui/pitchscreen.c
+++ b/apps/gui/pitchscreen.c
@@ -746,6 +746,8 @@ int gui_syncpitchscreen_run(void)
     struct viewport pitch_viewports[NB_SCREENS][PITCH_ITEM_COUNT];
     int max_lines[NB_SCREENS];
 
+    push_current_activity(ACTIVITY_PITCHSCREEN);
+
 #if CONFIG_CODEC == SWCODEC
     int32_t new_speed = 0, new_stretch;
 
@@ -1060,5 +1062,6 @@ int gui_syncpitchscreen_run(void)
 #if CONFIG_CODEC == SWCODEC
     pcmbuf_set_low_latency(false);
 #endif
+    pop_current_activity();
     return 0;
 }
diff --git a/apps/root_menu.c b/apps/root_menu.c
index bee1502781..3e53bd9dc1 100644
--- a/apps/root_menu.c
+++ b/apps/root_menu.c
@@ -339,7 +339,12 @@ static int miscscrn(void * param)
 static int playlist_view(void * param)
 {
     (void)param;
-    switch (playlist_viewer())
+    int val;
+
+    push_current_activity(ACTIVITY_PLAYLISTVIEWER);
+    val = playlist_viewer();
+    pop_current_activity();
+    switch (val)
     {
         case PLAYLIST_VIEWER_MAINMENU:
         case PLAYLIST_VIEWER_USB: