1 files changed, 9 insertions, 3 deletions

diff --git a/apps/playlist.c b/apps/playlist.c
index 4a6db883f7..2896f62e76 100644
--- a/apps/playlist.c
+++ b/apps/playlist.c
@@ -86,6 +86,7 @@
 #include "screens.h"
 #include "buffer.h"
 #include "misc.h"
+#include "filefuncs.h"
 #include "button.h"
 #include "filetree.h"
 #include "abrepeat.h"
@@ -103,7 +104,6 @@
 #include "rbunicode.h"
 #include "root_menu.h"
 
-#define PLAYLIST_CONTROL_FILE ROCKBOX_DIR "/.playlist_control"
 #define PLAYLIST_CONTROL_FILE_VERSION 2
 
 /*
@@ -1440,7 +1440,12 @@ static int get_next_dir(char *dir, bool is_forward, bool recursion)
     /* process random folder advance */
     if (global_settings.next_folder == FOLDER_ADVANCE_RANDOM)
     {
-        int fd = open(ROCKBOX_DIR "/folder_advance_list.dat", O_RDONLY);
+        char folder_advance_list[MAX_PATH];
+        get_user_file_path(ROCKBOX_DIR, FORCE_BUFFER_COPY,
+                folder_advance_list, sizeof(folder_advance_list));
+        strlcat(folder_advance_list, "/folder_advance_list.dat",
+                sizeof(folder_advance_list));
+        int fd = open(folder_advance_list, O_RDONLY);
         if (fd >= 0)
         {
             char buffer[MAX_PATH];
@@ -1910,7 +1915,8 @@ void playlist_init(void)
     struct playlist_info* playlist = &current_playlist;
 
     playlist->current = true;
-    strlcpy(playlist->control_filename, PLAYLIST_CONTROL_FILE,
+    get_user_file_path(PLAYLIST_CONTROL_FILE, IS_FILE|NEED_WRITE|FORCE_BUFFER_COPY,
+            playlist->control_filename,
             sizeof(playlist->control_filename));
     playlist->fd = -1;
     playlist->control_fd = -1;