diff --git a/apps/misc.h b/apps/misc.h
index 1e151f0ebc..05d8316783 100644
--- a/apps/misc.h
+++ b/apps/misc.h
@@ -114,7 +114,8 @@ enum current_activity {
     ACTIVITY_QUICKSCREEN,
     ACTIVITY_PITCHSCREEN,
     ACTIVITY_OPTIONSELECT,
-    ACTIVITY_PLAYLISTBROWSER
+    ACTIVITY_PLAYLISTBROWSER,
+    ACTIVITY_PLUGIN
 };
 
 #if CONFIG_CODEC == SWCODEC
diff --git a/apps/plugin.c b/apps/plugin.c
index c12a996408..50fbb37012 100644
--- a/apps/plugin.c
+++ b/apps/plugin.c
@@ -864,6 +864,7 @@ int plugin_load(const char* plugin, const void* parameter)
     lcd_remote_clear_display();
     lcd_remote_update();
 #endif
+    push_current_activity(ACTIVITY_PLUGIN);
 
     FOR_NB_SCREENS(i)
        viewportmanager_theme_enable(i, false, NULL);
@@ -877,6 +878,8 @@ int plugin_load(const char* plugin, const void* parameter)
 #endif
 
     rc = p_hdr->entry_point(parameter);
+    
+    pop_current_activity();
 
     if (!pfn_tsr_exit)
     {   /* close handle if plugin is no tsr one */
diff --git a/manual/appendix/wps_tags.tex b/manual/appendix/wps_tags.tex
index 02561c5d6e..01bf3cc874 100644
--- a/manual/appendix/wps_tags.tex
+++ b/manual/appendix/wps_tags.tex
@@ -269,7 +269,7 @@ 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\\
+                Pitchscreen, Setting chooser, Playlist Catalog Viewer, Plugin\\
   \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.