diff --git a/firmware/export/rbpaths.h b/firmware/export/rbpaths.h
index de591f0ec1..87a6dd91ff 100644
--- a/firmware/export/rbpaths.h
+++ b/firmware/export/rbpaths.h
@@ -79,8 +79,8 @@
 
 #define HOME_DIR_LEN (sizeof(HOME_DIR)-1)
 
-#define REC_BASE_DIR        HOME_DIR
-#define PLAYLIST_CATALOG_DEFAULT_DIR HOME_DIR "/Playlists"
+#define REC_BASE_DIR        "/Recordings"
+#define PLAYLIST_CATALOG_DEFAULT_DIR "/Playlists"
 
 #define LANG_DIR            ROCKBOX_DIR "/langs"
 
diff --git a/firmware/target/hosted/filesystem-app.c b/firmware/target/hosted/filesystem-app.c
index 3cb0dd3653..57f9b47282 100644
--- a/firmware/target/hosted/filesystem-app.c
+++ b/firmware/target/hosted/filesystem-app.c
@@ -46,13 +46,13 @@ static const char rbhome[] = "/sdcard";
         && !defined(__PCTOOL__)
 static const char *rbhome;
 #else
-/* YPR0, YPR1, NWZ */
+/* YPR0, YPR1, NWZ, etc */
 static const char rbhome[] = HOME_DIR;
 #endif
 
 #if !(defined(SAMSUNG_YPR0) || defined(SAMSUNG_YPR1) || defined(DX50) || \
-    defined(SONY_NWZ_LINUX) || defined(DX90) || defined(AGPTEK_ROCKER) || \
-    defined(XDUOO_X3II) || defined(XDUOO_X20)) &&	\
+     defined(SONY_NWZ_LINUX) || defined(DX90) || defined(AGPTEK_ROCKER) || \
+     defined(XDUOO_X3II) || defined(XDUOO_X20)) &&	\
     !defined(__PCTOOL__)
 /* Special dirs are user-accessible (and user-writable) dirs which take priority
  * over the ones where Rockbox is installed to. Classic example would be