2 files changed, 8 insertions, 2 deletions

diff --git a/apps/playlist.c b/apps/playlist.c
index b73aaa85c7..76ce81b51a 100644
--- a/apps/playlist.c
+++ b/apps/playlist.c
@@ -253,7 +253,7 @@ int play_list(char *dir,         /* "current directory" */
             /* now shuffle around the indices */
             randomise_playlist( random_seed );
 
-            if(!shuffled_index) {
+            if(!shuffled_index && global_settings.play_selected) {
                 /* The given index was for the unshuffled list, so we need
                    to figure out the index AFTER the shuffle has been made.
                    We scan for the seek position we remmber from before. */
diff --git a/apps/settings_menu.c b/apps/settings_menu.c
index cc5ff3c127..d40263cd00 100644
--- a/apps/settings_menu.c
+++ b/apps/settings_menu.c
@@ -59,6 +59,12 @@ static Menu shuffle(void)
 }
 #endif
 
+static Menu play_selected(void)
+{
+    set_bool( "Play Selected", &global_settings.play_selected );
+    return MENU_OK;
+}
+
 static Menu mp3_filter(void)
 {
     set_bool( "Music Filter", &global_settings.mp3filter );
@@ -206,6 +212,7 @@ Menu playback_settings_menu(void)
 #ifndef HAVE_RECORDER_KEYPAD
         { "Shuffle",        shuffle            },
 #endif
+        { "Play Selected",  play_selected      },
         { "Resume",         resume             },
         { "FF/RW Min Step", ff_rewind_min_step },
         { "FF/RW Accel",    ff_rewind_accel    },
@@ -336,4 +343,3 @@ Menu settings_menu(void)
     menu_exit(m);
     return result;
 }
-