1 files changed, 5 insertions, 1 deletions

diff --git a/apps/bookmark.c b/apps/bookmark.c
index 3db049475d..2411ddb0ee 100644
--- a/apps/bookmark.c
+++ b/apps/bookmark.c
@@ -520,7 +520,11 @@ static char* create_bookmark(char **name,
 /* ----------------------------------------------------------------------- */
 static void get_track_resume_info(struct resume_info *resume_info)
 {
-    playlist_get_resume_info(&(resume_info->resume_index));
+    if (global_settings.playlist_shuffle)
+        playlist_get_resume_info(&(resume_info->resume_index));
+    else
+        resume_info->resume_index = playlist_get_display_index() - 1;
+
     resume_info->resume_seed = playlist_get_seed(NULL);
     resume_info->id3 = audio_current_track();
     resume_info->repeat_mode = global_settings.repeat_mode;