diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
index fd3b75c36d..fd5e3599b1 100644
--- a/menu/cbs/menu_cbs_ok.c
+++ b/menu/cbs/menu_cbs_ok.c
@@ -252,17 +252,10 @@ int generic_action_ok_displaylist_push(const char *path,
          info_label         = label;
          dl_type                 = DISPLAYLIST_GENERIC;
          break;
-      case ACTION_OK_DL_DOWNLOADS_DIR:
-         info.type          = FILE_TYPE_DIRECTORY;
-         info.directory_ptr = idx;
-         info_path          = settings->directory.core_assets;
-         info_label         = label;
-         dl_type                 = DISPLAYLIST_GENERIC;
-         break;
       case ACTION_OK_DL_CONTENT_LIST:
          info.type          = FILE_TYPE_DIRECTORY;
          info.directory_ptr = idx;
-         info_path          = settings->directory.menu_content;
+         info_path          = new_path;
          info_label         = label;
          dl_type                 = DISPLAYLIST_GENERIC;
          break;
@@ -2655,15 +2648,19 @@ static int action_ok_remap_file(const char *path,
 static int action_ok_push_content_list(const char *path,
       const char *label, unsigned type, size_t idx, size_t entry_idx)
 {
-   return generic_action_ok_displaylist_push(path, NULL, label, type, idx,
+   settings_t            *settings   = config_get_ptr();
+   return generic_action_ok_displaylist_push(path, settings->directory.menu_content, label, type, idx,
          entry_idx, ACTION_OK_DL_CONTENT_LIST);
 }
 
 static int action_ok_push_downloads_dir(const char *path,
       const char *label, unsigned type, size_t idx, size_t entry_idx)
 {
-   return generic_action_ok_displaylist_push(path, NULL, label, type, idx,
-         entry_idx, ACTION_OK_DL_DOWNLOADS_DIR);
+   settings_t            *settings   = config_get_ptr();
+   return generic_action_ok_displaylist_push(path, settings->directory.core_assets, 
+         msg_hash_to_str(MENU_ENUM_LABEL_DETECT_CORE_LIST),
+         type, idx,
+         entry_idx, ACTION_OK_DL_CONTENT_LIST);
 }
 
 static int action_ok_shader_preset(const char *path,
diff --git a/menu/menu_cbs.h b/menu/menu_cbs.h
index 790e5d4550..a112a481f2 100644
--- a/menu/menu_cbs.h
+++ b/menu/menu_cbs.h
@@ -38,7 +38,6 @@ enum
    ACTION_OK_DL_GENERIC,
    ACTION_OK_DL_PUSH_DEFAULT,
    ACTION_OK_DL_FILE_BROWSER_SELECT_DIR,
-   ACTION_OK_DL_DOWNLOADS_DIR,
    ACTION_OK_DL_INPUT_SETTINGS_LIST,
    ACTION_OK_DL_DRIVER_SETTINGS_LIST,
    ACTION_OK_DL_VIDEO_SETTINGS_LIST,