diff --git a/apps/onplay.c b/apps/onplay.c
index a5a92e7c1c..83b24da78d 100644
--- a/apps/onplay.c
+++ b/apps/onplay.c
@@ -1576,6 +1576,8 @@ static bool onplay_load_plugin(void *param)
     int ret = filetype_load_plugin((const char*)param, selected_file);
     if (ret == PLUGIN_USB_CONNECTED)
         onplay_result = ONPLAY_RELOAD_DIR;
+    else if (ret == PLUGIN_GOTO_PLUGIN)
+        onplay_result = ONPLAY_PLUGIN;
     return false;
 }
 
diff --git a/apps/tree.c b/apps/tree.c
index f50d424a82..7fcced92c8 100644
--- a/apps/tree.c
+++ b/apps/tree.c
@@ -805,6 +805,7 @@ static int dirbrowse(void)
                 {
                     case ONPLAY_MAINMENU:
                         return GO_TO_ROOT;
+                        break;
 
                     case ONPLAY_OK:
                         restore = true;
@@ -817,6 +818,10 @@ static int dirbrowse(void)
                     case ONPLAY_START_PLAY:
                         return GO_TO_WPS;
                         break;
+
+                    case ONPLAY_PLUGIN:
+                        return GO_TO_PLUGIN;
+                        break;
                 }
                 break;
             }