diff --git a/frontend/drivers/platform_emscripten.c b/frontend/drivers/platform_emscripten.c
index 7b683bd6cf..41922d8c87 100644
--- a/frontend/drivers/platform_emscripten.c
+++ b/frontend/drivers/platform_emscripten.c
@@ -117,7 +117,7 @@ static void frontend_emscripten_get_env(int *argc, char *argv[],
          "bundle/shaders", sizeof(g_defaults.dir.shader));
 
    /* user data dirs */
-   fill_pathname_join(g_defaults.dir.cheats, base_path,
+   fill_pathname_join(g_defaults.dir.cheats, user_path,
          "cheats", sizeof(g_defaults.dir.cheats));
    fill_pathname_join(g_defaults.dir.menu_config, user_path,
          "config", sizeof(g_defaults.dir.menu_config));
@@ -150,20 +150,11 @@ static void frontend_emscripten_get_env(int *argc, char *argv[],
    fill_pathname_join(g_defaults.path.config, user_path,
          file_path_str(FILE_PATH_MAIN_CONFIG), sizeof(g_defaults.path.config));
 
-   path_mkdir(g_defaults.dir.core);
-
-   path_mkdir(g_defaults.dir.assets);
-   path_mkdir(g_defaults.dir.autoconfig);
-   path_mkdir(g_defaults.dir.cursor);
-   path_mkdir(g_defaults.dir.database);
-   path_mkdir(g_defaults.dir.core_info);
-   path_mkdir(g_defaults.dir.overlay);
-   path_mkdir(g_defaults.dir.shader);
-
+   /* create user data dirs */
    path_mkdir(g_defaults.dir.cheats);
+   path_mkdir(g_defaults.dir.core_assets);
    path_mkdir(g_defaults.dir.menu_config);
    path_mkdir(g_defaults.dir.menu_content);
-   path_mkdir(g_defaults.dir.core_assets);
    path_mkdir(g_defaults.dir.playlist);
    path_mkdir(g_defaults.dir.remap);
    path_mkdir(g_defaults.dir.savestate);
@@ -172,6 +163,7 @@ static void frontend_emscripten_get_env(int *argc, char *argv[],
    path_mkdir(g_defaults.dir.system);
    path_mkdir(g_defaults.dir.thumbnails);
 
+   /* create cache dir */
    path_mkdir(g_defaults.dir.cache);
 
    snprintf(g_defaults.settings.menu, sizeof(g_defaults.settings.menu), "rgui");
diff --git a/frontend/drivers/platform_psp.c b/frontend/drivers/platform_psp.c
index 785898fda1..fdfc25c46d 100644
--- a/frontend/drivers/platform_psp.c
+++ b/frontend/drivers/platform_psp.c
@@ -131,9 +131,6 @@ static void frontend_psp_get_environment_settings(int *argc, char *argv[],
    fill_pathname_join(g_defaults.path.config, g_defaults.dir.port,
          file_path_str(FILE_PATH_MAIN_CONFIG), sizeof(g_defaults.path.config));
 #else
-   /* it seems recursive mkdir doesn't always works on PSP
-      so create this dir first */
-   path_mkdir(user_path);
 
    fill_pathname_join(g_defaults.dir.core, g_defaults.dir.port,
          "CORES", sizeof(g_defaults.dir.core));
@@ -141,6 +138,7 @@ static void frontend_psp_get_environment_settings(int *argc, char *argv[],
          "INFO", sizeof(g_defaults.dir.core_info));
 
    /* bundle data */
+   /*
    fill_pathname_join(g_defaults.dir.assets, g_defaults.dir.port,
          "BUNDLE/ASSETS", sizeof(g_defaults.dir.assets));
    fill_pathname_join(g_defaults.dir.autoconfig, g_defaults.dir.port,
@@ -155,6 +153,7 @@ static void frontend_psp_get_environment_settings(int *argc, char *argv[],
          "BUNDLE/OVERLAYS", sizeof(g_defaults.dir.osk_overlay));
    fill_pathname_join(g_defaults.dir.shader, base_path,
          "BUNDLE/SHADERS", sizeof(g_defaults.dir.shader));
+   */
 
    /* user data */
    fill_pathname_join(g_defaults.dir.cheats, user_path,
@@ -175,6 +174,8 @@ static void frontend_psp_get_environment_settings(int *argc, char *argv[],
          "SCREENSHOTS", sizeof(g_defaults.dir.screenshot));
    fill_pathname_join(g_defaults.dir.system, user_path,
          "SYSTEM", sizeof(g_defaults.dir.system));
+   /* fill_pathname_join(g_defaults.dir.thumbnails, user_path,
+         "THUMBNAILS", sizeof(g_defaults.dir.thumbnails)); */
 
    /* cache dir */
    fill_pathname_join(g_defaults.dir.cache, user_path,
@@ -186,18 +187,21 @@ static void frontend_psp_get_environment_settings(int *argc, char *argv[],
    fill_pathname_join(g_defaults.path.config, user_path,
          file_path_str(FILE_PATH_MAIN_CONFIG), sizeof(g_defaults.path.config));
 #endif
-   /* create the dirs to avoid problems further down the line */
-   path_mkdir(g_defaults.dir.assets);
-   path_mkdir(g_defaults.dir.cache);
+   /* create user data dirs */ 
    path_mkdir(g_defaults.dir.cheats);
    path_mkdir(g_defaults.dir.core_assets);
    path_mkdir(g_defaults.dir.playlist);
    path_mkdir(g_defaults.dir.menu_config);
+   path_mkdir(g_defaults.dir.playlist);
    path_mkdir(g_defaults.dir.remap);
    path_mkdir(g_defaults.dir.savestate);
    path_mkdir(g_defaults.dir.screenshot);
    path_mkdir(g_defaults.dir.sram);
    path_mkdir(g_defaults.dir.system);
+   /* path_mkdir(g_defaults.dir.thumbnails); */
+
+   /* create cache dir */
+   path_mkdir(g_defaults.dir.cache);