diff --git a/apps/playlist_viewer.c b/apps/playlist_viewer.c
index 43c0c0142e..ffaefebd5f 100644
--- a/apps/playlist_viewer.c
+++ b/apps/playlist_viewer.c
@@ -450,7 +450,7 @@ static int onplay_menu(int index)
         playlist_buffer_get_track(&viewer.buffer, index);
     MENUITEM_STRINGLIST(menu_items, ID2P(LANG_PLAYLIST), NULL, 
                         ID2P(LANG_CURRENT_PLAYLIST), ID2P(LANG_CATALOG),
-                        ID2P(LANG_REMOVE), ID2P(LANG_MOVE),
+                        ID2P(LANG_REMOVE), ID2P(LANG_MOVE), ID2P(LANG_SHUFFLE),
                         ID2P(LANG_SAVE_DYNAMIC_PLAYLIST));
     bool current = (current_track->index == viewer.current_playing_track);
 
@@ -507,6 +507,11 @@ static int onplay_menu(int index)
                 ret = 0;
                 break;
             case 4:
+                /* shuffle */
+                playlist_randomise(viewer.playlist, current_tick, false);
+                ret = 1;
+                break;
+            case 5:
                 /* save playlist */
                 save_playlist_screen(viewer.playlist);
                 ret = 0;