3 files changed, 8 insertions, 3 deletions

diff --git a/apps/misc.h b/apps/misc.h
index 05d8316783..1fbff9eb2a 100644
--- a/apps/misc.h
+++ b/apps/misc.h
@@ -115,7 +115,8 @@ enum current_activity {
     ACTIVITY_PITCHSCREEN,
     ACTIVITY_OPTIONSELECT,
     ACTIVITY_PLAYLISTBROWSER,
-    ACTIVITY_PLUGIN
+    ACTIVITY_PLUGIN,
+    ACTIVITY_CONTEXTMENU
 };
 
 #if CONFIG_CODEC == SWCODEC
diff --git a/apps/onplay.c b/apps/onplay.c
index da06f937b6..03981c6310 100644
--- a/apps/onplay.c
+++ b/apps/onplay.c
@@ -1347,12 +1347,15 @@ int onplay(char* file, int attr, int from, bool hotkey)
 #else
     (void)hotkey;
 #endif
+
+    push_current_activity(ACTIVITY_CONTEXTMENU);
     if (context == CONTEXT_WPS)
         menu = &wps_onplay_menu;
     else
         menu = &tree_onplay_menu;
     menu_selection = do_menu(menu, NULL, NULL, false);
-    
+    pop_current_activity();
+
     switch (menu_selection)
     {
         case GO_TO_WPS:
diff --git a/manual/appendix/wps_tags.tex b/manual/appendix/wps_tags.tex
index 01bf3cc874..b869d532f3 100644
--- a/manual/appendix/wps_tags.tex
+++ b/manual/appendix/wps_tags.tex
@@ -269,7 +269,8 @@ Example: \config{\%?mp<Stop|Play|Pause|Ffwd|Rew|Rec|Rec pause|FM|FM pause>}
     \config{\%cs} & The current screen, 1-15, in the order:
                 Menus, WPS, Recording screen, FM Radio screen, Current Playlist screen,
                 Settings menus, File browser, Database, Plugins, Quickscreen,
-                Pitchscreen, Setting chooser, Playlist Catalog Viewer, Plugin\\
+                Pitchscreen, Setting chooser, Playlist Catalog Viewer, Plugin,
+                Conext Menu\\
   \end{tagmap}
 The tag can also be used as the switch in a conditional tag. For players without
 some capabilities (e.g. having no FM radio) some values will be never yielded.