diff --git a/apps/onplay.c b/apps/onplay.c
index fc236fc854..da94dbd5b8 100644
--- a/apps/onplay.c
+++ b/apps/onplay.c
@@ -1195,6 +1195,19 @@ static bool open_with(void)
     return list_viewers();
 }
 
+static int playlist_insert_shuffled(void)
+{
+    if ((audio_status() & AUDIO_STATUS_PLAY) ||
+        (selected_file_attr & ATTR_DIRECTORY) ||
+        ((selected_file_attr & FILE_ATTR_MASK) == FILE_ATTR_M3U))
+    {
+        playlist_insert_func((intptr_t*)PLAYLIST_INSERT_SHUFFLED);
+        return ONPLAY_START_PLAY;
+    }
+    
+    return ONPLAY_RELOAD_DIR;
+}
+
 struct hotkey_assignment {
     int action;             /* hotkey_action */
     int lang_id;            /* Language ID */
@@ -1228,6 +1241,9 @@ static struct hotkey_assignment hotkey_items[] = {
     { HOTKEY_INSERT,            LANG_INSERT,
             HOTKEY_FUNC(playlist_insert_func, (intptr_t*)PLAYLIST_INSERT),
             ONPLAY_START_PLAY },
+    { HOTKEY_INSERT_SHUFFLED,   LANG_INSERT_SHUFFLED,
+            HOTKEY_FUNC(playlist_insert_shuffled, NULL),
+            ONPLAY_OK },
 };
 
 static const int num_hotkey_items = sizeof(hotkey_items) / sizeof(hotkey_items[0]);
@@ -1261,15 +1277,20 @@ static int execute_hotkey(bool is_wps)
         {
             /* run the associated function (with optional param), if any */
             const struct menu_func func = this_item->func;
+            int func_return;
             if (func.function != NULL)
             {
                 if (func.param != NULL)
-                    (*func.function_w_param)(func.param);
+                    func_return = (*func.function_w_param)(func.param);
                 else
-                    (*func.function)();
+                    func_return = (*func.function)();
             }
             /* return with the associated code */
-            return this_item->return_code;
+            const int return_code = this_item->return_code;
+            /* ONPLAY_OK here means to use the function return code */
+            if (return_code == ONPLAY_OK)
+                return func_return;
+            return return_code;
         }
     }
     
diff --git a/apps/onplay.h b/apps/onplay.h
index a489b09cce..8462603bcc 100644
--- a/apps/onplay.h
+++ b/apps/onplay.h
@@ -42,6 +42,7 @@ enum hotkey_action {
     HOTKEY_OPEN_WITH,
     HOTKEY_DELETE,
     HOTKEY_INSERT,
+    HOTKEY_INSERT_SHUFFLED,
 };
 #endif
 
diff --git a/apps/settings_list.c b/apps/settings_list.c
index 5a16f09763..61853f8276 100644
--- a/apps/settings_list.c
+++ b/apps/settings_list.c
@@ -1688,9 +1688,9 @@ const struct settings_list settings[] = {
         HOTKEY_OPEN_WITH, HOTKEY_DELETE),
     TABLE_SETTING(F_ALLOW_ARBITRARY_VALS, hotkey_tree,
         LANG_HOTKEY_FILE_BROWSER, HOTKEY_OFF, "hotkey tree",
-        "off,open with,delete,insert",
-        UNIT_INT, hotkey_formatter, hotkey_getlang, NULL, 4, HOTKEY_OFF,
-        HOTKEY_OPEN_WITH, HOTKEY_DELETE, HOTKEY_INSERT),
+        "off,open with,delete,insert,insert shuffled",
+        UNIT_INT, hotkey_formatter, hotkey_getlang, NULL, 5, HOTKEY_OFF,
+        HOTKEY_OPEN_WITH, HOTKEY_DELETE, HOTKEY_INSERT, HOTKEY_INSERT_SHUFFLED),
 #endif
 
 #if CONFIG_CODEC == SWCODEC
diff --git a/manual/appendix/config_file_options.tex b/manual/appendix/config_file_options.tex
index 0dd2f83568..e70a020e26 100644
--- a/manual/appendix/config_file_options.tex
+++ b/manual/appendix/config_file_options.tex
@@ -126,8 +126,8 @@
     \opt{hotkey}{
     hotkey wps      & off, view playlist, show track info,
         pitchscreen, open with, delete  & N/A\\
-    hotkey tree     & off, open with, delete, insert
-                                        & N/A\\
+    hotkey tree     & off, open with, delete, insert,
+        insert shuffled                 & N/A\\
     }
     sort files      & alpha, oldest, newest, type & N/A\\
     sort dirs       & alpha, oldest, newest & N/A\\