diff --git a/console/rarch_console.h b/console/rarch_console.h
index 203736546e..70419da69f 100644
--- a/console/rarch_console.h
+++ b/console/rarch_console.h
@@ -60,6 +60,7 @@ typedef struct
    char config_file[MAXIMUM_PATH];
    char core_dir[MAXIMUM_PATH];
    char executable_extension[MAXIMUM_PATH];
+   char filebrowser_startup_dir[MAXIMUM_PATH];
    char filesystem_root_dir[MAXIMUM_PATH];
    char input_presets_dir[MAXIMUM_PATH];
 #ifdef HAVE_MULTIMAN
diff --git a/console/rarch_console_config.c b/console/rarch_console_config.c
index 376aaf1e73..4b62aa272b 100644
--- a/console/rarch_console_config.c
+++ b/console/rarch_console_config.c
@@ -69,8 +69,8 @@ void rarch_config_load(const char * conf_name, const char * libretro_dir_path, c
       for (unsigned i = 0; i < 7; i++)
       {
          char cfg[64];
-	 snprintf(cfg, sizeof(cfg), "input_dpad_emulation_p%u", i + 1);
-	 CONFIG_GET_INT(input.dpad_emulation[i], cfg);
+         snprintf(cfg, sizeof(cfg), "input_dpad_emulation_p%u", i + 1);
+         CONFIG_GET_INT(input.dpad_emulation[i], cfg);
       }
 
       // g_console
@@ -135,8 +135,8 @@ void rarch_config_save(const char * conf_name)
       for (unsigned i = 0; i < 7; i++)
       {
          char cfg[64];
-	 snprintf(cfg, sizeof(cfg), "input_dpad_emulation_p%u", i + 1);
-	 config_set_int(conf, cfg, g_settings.input.dpad_emulation[i]);
+         snprintf(cfg, sizeof(cfg), "input_dpad_emulation_p%u", i + 1);
+         config_set_int(conf, cfg, g_settings.input.dpad_emulation[i]);
       }
 
 #ifdef RARCH_CONSOLE
diff --git a/console/rarch_console_settings.c b/console/rarch_console_settings.c
index b5319252e1..f41e39ca3a 100644
--- a/console/rarch_console_settings.c
+++ b/console/rarch_console_settings.c
@@ -235,7 +235,7 @@ void rarch_settings_msg(unsigned setting, unsigned delay)
                break;
 #ifdef HAVE_HDD_CACHE_PARTITION
             case ZIP_EXTRACT_TO_CACHE_DIR:
-	       snprintf(str, sizeof(str), "INFO - ZIP file successfully extracted to cache partition.");
+               snprintf(str, sizeof(str), "INFO - ZIP file successfully extracted to cache partition.");
                break;
 #endif
          }
@@ -358,14 +358,7 @@ void rarch_settings_set_default (const input_driver_t *input)
    g_console.mode_switch = MODE_MENU;
    g_console.screen_orientation = ORIENTATION_NORMAL;
    g_console.current_resolution_id = 0;
-#if defined(_XBOX360)
-   //Ugly but necessary hack
-   strlcpy(g_console.default_rom_startup_dir, "game:", sizeof(g_console.default_rom_startup_dir));
-#elif defined(_XBOX1)
-   strlcpy(g_console.default_rom_startup_dir, "D:", sizeof(g_console.default_rom_startup_dir));
-#else
-   strlcpy(g_console.default_rom_startup_dir, default_paths.filesystem_root_dir, sizeof(g_console.default_rom_startup_dir));
-#endif
+   strlcpy(g_console.default_rom_startup_dir, default_paths.filebrowser_startup_dir, sizeof(g_console.default_rom_startup_dir));
    strlcpy(g_console.default_savestate_dir, default_paths.savestate_dir, sizeof(g_console.default_savestate_dir));
    strlcpy(g_console.default_sram_dir, default_paths.sram_dir, sizeof(g_console.default_sram_dir));
    g_console.aspect_ratio_index = 0;
diff --git a/ps3/frontend/main.c b/ps3/frontend/main.c
index 1ed758ad86..8793363074 100644
--- a/ps3/frontend/main.c
+++ b/ps3/frontend/main.c
@@ -201,6 +201,7 @@ static void get_environment_settings(int argc, char *argv[])
       snprintf(default_paths.executable_extension, sizeof(default_paths.executable_extension), ".SELF");
       snprintf(default_paths.savestate_dir, sizeof(default_paths.savestate_dir), "%s/savestates", default_paths.core_dir);
       snprintf(default_paths.filesystem_root_dir, sizeof(default_paths.filesystem_root_dir), "/");
+      snprintf(default_paths.filebrowser_startup_dir, sizeof(default_paths.filebrowser_startup_dir), default_paths.filesystem_root_dir);
       snprintf(default_paths.sram_dir, sizeof(default_paths.sram_dir), "%s/sram", default_paths.core_dir);
 
       snprintf(default_paths.system_dir, sizeof(default_paths.system_dir), "%s/system", default_paths.core_dir);
diff --git a/wii/frontend/main.c b/wii/frontend/main.c
index 7d0381b298..485eed98d8 100644
--- a/wii/frontend/main.c
+++ b/wii/frontend/main.c
@@ -201,6 +201,7 @@ static void get_environment_settings(void)
    snprintf(default_paths.system_dir, sizeof(default_paths.system_dir), "%s/system", default_paths.core_dir);
    snprintf(default_paths.savestate_dir, sizeof(default_paths.savestate_dir), "%s/savestates", default_paths.core_dir);
    snprintf(default_paths.filesystem_root_dir, sizeof(default_paths.filesystem_root_dir), "/");
+   snprintf(default_paths.filebrowser_startup_dir, sizeof(default_paths.filebrowser_startup_dir), default_paths.filesystem_root_dir);
    snprintf(default_paths.sram_dir, sizeof(default_paths.sram_dir), "%s/sram", default_paths.core_dir);
    snprintf(default_paths.input_presets_dir, sizeof(default_paths.input_presets_dir), "%s/presets/input", default_paths.core_dir);
    strlcpy(default_paths.executable_extension, ".dol", sizeof(default_paths.executable_extension));
diff --git a/xdk/frontend/main.c b/xdk/frontend/main.c
index 958f3b30df..87c824148b 100644
--- a/xdk/frontend/main.c
+++ b/xdk/frontend/main.c
@@ -109,6 +109,7 @@ static void get_environment_settings (void)
    strlcpy(default_paths.system_dir, "D:\\system\\", sizeof(default_paths.system_dir));
    strlcpy(default_paths.filesystem_root_dir, "D:\\", sizeof(default_paths.filesystem_root_dir));
    strlcpy(default_paths.executable_extension, ".xbe", sizeof(default_paths.executable_extension));
+   strlcpy(default_paths.filebrowser_startup_dir, "D:", sizeof(default_paths.filebrowser_startup_dir));
 #elif defined(_XBOX360)
 #ifdef HAVE_HDD_CACHE_PARTITION
    strlcpy(default_paths.cache_dir, "cache:\\", sizeof(default_paths.cache_dir));
@@ -118,6 +119,7 @@ static void get_environment_settings (void)
    strlcpy(default_paths.config_file, "game:\\retroarch.cfg", sizeof(default_paths.config_file));
    strlcpy(default_paths.system_dir, "game:\\system\\", sizeof(default_paths.system_dir));
    strlcpy(default_paths.executable_extension, ".xex", sizeof(default_paths.executable_extension));
+   strlcpy(default_paths.filebrowser_startup_dir, "game:", sizeof(default_paths.filebrowser_startup_dir));
 #endif
 }