diff --git a/apps/playlist.c b/apps/playlist.c
index 1e5c12a181..3c512cd82f 100644
--- a/apps/playlist.c
+++ b/apps/playlist.c
@@ -106,6 +106,11 @@ int playlist_amount(void)
     return playlist.amount;
 }
 
+int playlist_first_index(void)
+{
+    return playlist.first_index;
+}
+
 int playlist_next(int steps)
 {
     playlist.index = get_next_index(steps);
diff --git a/apps/playlist.h b/apps/playlist.h
index 24f9d7df6f..c47fec4325 100644
--- a/apps/playlist.h
+++ b/apps/playlist.h
@@ -53,5 +53,6 @@ void add_indices_to_playlist(void);
 void playlist_clear(void);
 int playlist_add(char *filename);
 int playlist_amount(void);
+int playlist_first_index(void);
 
 #endif /* __PLAYLIST_H__ */
diff --git a/apps/tree.c b/apps/tree.c
index 5cd803adfe..b35e44861c 100644
--- a/apps/tree.c
+++ b/apps/tree.c
@@ -906,7 +906,8 @@ bool dirbrowse(char *root)
                                shuffled list in case shuffle is enabled */
                             global_settings.resume_index = start_index;
                             global_settings.resume_offset = 0;
-                            global_settings.resume_first_index = start_index;
+                            global_settings.resume_first_index =
+                                playlist_first_index();
                             global_settings.resume_seed = seed;
                             settings_save();
                         }