diff --git a/console/rarch_console.h b/console/rarch_console.h
index 7eaa0a9450..1866d4a642 100644
--- a/console/rarch_console.h
+++ b/console/rarch_console.h
@@ -32,6 +32,7 @@ typedef struct
    char shader_dir[PATH_MAX];
    char savestate_dir[PATH_MAX];
    char sram_dir[PATH_MAX];
+   char screenshot_dir[PATH_MAX];
    char system_dir[PATH_MAX];
 } default_paths_t;
 
diff --git a/frontend/platform/platform_xdk.c b/frontend/platform/platform_xdk.c
index 7753fcaabc..46d94a6f57 100644
--- a/frontend/platform/platform_xdk.c
+++ b/frontend/platform/platform_xdk.c
@@ -228,17 +228,15 @@ static void frontend_xdk_get_environment_settings(int argc, char *argv[], void *
    fill_pathname_join(default_paths.savestate_dir, default_paths.core_dir, "savestates", sizeof(default_paths.savestate_dir));
    fill_pathname_join(default_paths.sram_dir, default_paths.core_dir, "savefiles", sizeof(default_paths.sram_dir));
    fill_pathname_join(default_paths.system_dir, default_paths.core_dir, "system", sizeof(default_paths.system_dir));
+   fill_pathname_join(default_paths.screenshot_dir, default_paths.core_dir, "screenshots", sizeof(default_paths.screenshot_dir));
 #ifndef IS_SALAMANDER
-   fill_pathname_join(g_settings.screenshot_directory, default_paths.core_dir, "screenshots", sizeof(g_settings.screenshot_directory));
    strlcpy(g_extern.menu_texture_path, "D:\\Media\\main-menu_480p.png", sizeof(g_extern.menu_texture_path));
 #endif
 #elif defined(_XBOX360)
    strlcpy(default_paths.core_dir, "game:", sizeof(default_paths.core_dir));
    strlcpy(default_paths.core_info_dir, "game:", sizeof(default_paths.core_info_dir));
    strlcpy(default_paths.config_path, "game:\\retroarch.cfg", sizeof(default_paths.config_path));
-#ifndef IS_SALAMANDER
-   strlcpy(g_settings.screenshot_directory, "game:", sizeof(g_settings.screenshot_directory));
-#endif
+   strlcpy(default_paths.screenshot_dir, "game:", sizeof(default_paths.screenshot_dir));
    strlcpy(default_paths.savestate_dir, "game:\\savestates", sizeof(default_paths.savestate_dir));
    strlcpy(default_paths.sram_dir, "game:\\savefiles", sizeof(default_paths.sram_dir));
    strlcpy(default_paths.system_dir, "game:\\system", sizeof(default_paths.system_dir));
diff --git a/settings.c b/settings.c
index c86d798eb1..338649a573 100644
--- a/settings.c
+++ b/settings.c
@@ -492,6 +492,8 @@ void config_set_defaults(void)
       strlcpy(g_extern.savefile_dir, default_paths.sram_dir, sizeof(g_extern.savefile_dir));
    if (*default_paths.system_dir)
       strlcpy(g_settings.system_directory, default_paths.system_dir, sizeof(g_settings.system_directory));
+   if (*default_paths.screenshot_dir)
+      strlcpy(g_settings.screenshot_directory, default_paths.screenshot_dir, sizeof(g_settings.screenshot_directory));
 
    if (*default_paths.config_path)
       strlcpy(g_extern.config_path, default_paths.config_path, sizeof(g_extern.config_path));