diff --git a/frontend/menu/backend/menu_common_backend.c b/frontend/menu/backend/menu_common_backend.c
index d6470f6111..f95ef87102 100644
--- a/frontend/menu/backend/menu_common_backend.c
+++ b/frontend/menu/backend/menu_common_backend.c
@@ -395,9 +395,9 @@ static void menu_common_entries_init(void *data, unsigned menu_type)
 #endif
       case MENU_SETTINGS_PATH_OPTIONS:
          file_list_clear(menu->selection_buf);
-         if ((current_setting = (rarch_setting_t*)setting_data_find_setting(setting_data, "game_history_path")))
-            file_list_push(menu->selection_buf, current_setting->short_description, MENU_BROWSER_DIR_PATH, 0);
          if ((current_setting = (rarch_setting_t*)setting_data_find_setting(setting_data, "rgui_browser_directory")))
+            file_list_push(menu->selection_buf, current_setting->short_description, MENU_BROWSER_DIR_PATH, 0);
+         if ((current_setting = (rarch_setting_t*)setting_data_find_setting(setting_data, "content_directory")))
             file_list_push(menu->selection_buf, current_setting->short_description, MENU_CONTENT_DIR_PATH, 0);
          if ((current_setting = (rarch_setting_t*)setting_data_find_setting(setting_data, "assets_directory")))
             file_list_push(menu->selection_buf, current_setting->short_description, MENU_ASSETS_DIR_PATH, 0);
@@ -2687,14 +2687,14 @@ static int menu_common_iterate(unsigned action)
             }
             else if (menu_type == MENU_BROWSER_DIR_PATH)
             {
-               if ((current_setting = (rarch_setting_t*)setting_data_find_setting(setting_data, "game_history_path")))
+               if ((current_setting = (rarch_setting_t*)setting_data_find_setting(setting_data, "rgui_browser_directory")))
                   menu_common_setting_set_current_string_dir(current_setting, dir);
 
                menu_flush_stack_type(MENU_SETTINGS_PATH_OPTIONS);
             }
             else if (menu_type == MENU_CONTENT_DIR_PATH)
             {
-               if ((current_setting = (rarch_setting_t*)setting_data_find_setting(setting_data, "rgui_browser_directory")))
+               if ((current_setting = (rarch_setting_t*)setting_data_find_setting(setting_data, "content_directory")))
                   menu_common_setting_set_current_string_dir(current_setting, dir);
 
                menu_flush_stack_type(MENU_SETTINGS_PATH_OPTIONS);
diff --git a/settings_data.c b/settings_data.c
index b7a7849a5f..504aa321c2 100644
--- a/settings_data.c
+++ b/settings_data.c
@@ -601,6 +601,8 @@ static void general_read_handler(const void *data)
         *setting->value.boolean = g_settings.menu_show_start_screen;
     else if (!strcmp(setting->name,  "game_history_size"))
         *setting->value.unsigned_integer = g_settings.game_history_size;
+    else if (!strcmp(setting->name, "content_directory"))
+        strlcpy(setting->value.string, g_settings.content_directory, setting->size);
 #ifdef HAVE_MENU
     else if (!strcmp(setting->name, "rgui_browser_directory"))
         strlcpy(setting->value.string, g_settings.menu_content_directory, setting->size);
@@ -946,6 +948,8 @@ static void general_write_handler(const void *data)
         g_settings.menu_show_start_screen = *setting->value.boolean;
     else if (!strcmp(setting->name,  "game_history_size"))
         g_settings.game_history_size = *setting->value.unsigned_integer;
+    else if (!strcmp(setting->name, "content_directory"))
+        strlcpy(g_settings.content_directory, setting->value.string, sizeof(g_settings.content_directory));
 #ifdef HAVE_MENU
     else if (!strcmp(setting->name, "rgui_browser_directory"))
         strlcpy(g_settings.menu_content_directory, setting->value.string, sizeof(g_settings.menu_content_directory));
@@ -1331,7 +1335,8 @@ rarch_setting_t* setting_data_get_list(void)
          END_SUB_GROUP()
          START_SUB_GROUP("Paths")
 #ifdef HAVE_MENU
-         CONFIG_PATH(g_settings.menu_content_directory,     "rgui_browser_directory",     "Content Directory",          "", GROUP_NAME, SUBGROUP_NAME, general_write_handler, general_read_handler)                WITH_FLAGS(SD_FLAG_ALLOW_EMPTY | SD_FLAG_PATH_DIR)
+         CONFIG_PATH(g_settings.menu_content_directory,     "rgui_browser_directory",     "Browser Directory",          "", GROUP_NAME, SUBGROUP_NAME, general_write_handler, general_read_handler)                WITH_FLAGS(SD_FLAG_ALLOW_EMPTY | SD_FLAG_PATH_DIR)
+         CONFIG_PATH(g_settings.content_directory,     "content_directory",     "Content Directory",          "", GROUP_NAME, SUBGROUP_NAME, general_write_handler, general_read_handler)                WITH_FLAGS(SD_FLAG_ALLOW_EMPTY | SD_FLAG_PATH_DIR)
          CONFIG_PATH(g_settings.assets_directory,           "assets_directory",           "Assets Directory",           "", GROUP_NAME, SUBGROUP_NAME, general_write_handler, general_read_handler)                WITH_FLAGS(SD_FLAG_ALLOW_EMPTY | SD_FLAG_PATH_DIR)
          CONFIG_PATH(g_settings.menu_config_directory,      "rgui_config_directory",      "Config Directory",           "", GROUP_NAME, SUBGROUP_NAME, general_write_handler, general_read_handler)                WITH_FLAGS(SD_FLAG_ALLOW_EMPTY | SD_FLAG_PATH_DIR)