diff --git a/menu/cbs/menu_cbs_deferred_push.c b/menu/cbs/menu_cbs_deferred_push.c
index 549c3a9172..dde7c306d7 100644
--- a/menu/cbs/menu_cbs_deferred_push.c
+++ b/menu/cbs/menu_cbs_deferred_push.c
@@ -602,9 +602,6 @@ static int menu_cbs_init_bind_deferred_push_compare_label(menu_file_list_cbs_t *
          case MENU_LABEL_CORE_INPUT_REMAPPING_OPTIONS:
             cbs->action_deferred_push = deferred_push_core_input_remapping_options;
             break;
-         case MENU_LABEL_DISK_OPTIONS:
-            cbs->action_deferred_push = deferred_push_disk_options;
-            break;
          case MENU_LABEL_CORE_LIST:
             cbs->action_deferred_push = deferred_push_core_list;
             break;
@@ -659,6 +656,8 @@ static int menu_cbs_init_bind_deferred_push_compare_type(menu_file_list_cbs_t *c
       cbs->action_deferred_push = deferred_push_category;
    else if (type == MENU_FILE_PLAYLIST_COLLECTION)
       cbs->action_deferred_push = deferred_push_rdb_collection;
+   else if (type == MENU_SETTING_ACTION_CORE_DISK_OPTIONS)
+      cbs->action_deferred_push = deferred_push_disk_options;
    else
       return -1;
 
diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
index 5ba275b7f5..1a8bc032da 100644
--- a/menu/cbs/menu_cbs_ok.c
+++ b/menu/cbs/menu_cbs_ok.c
@@ -1790,6 +1790,9 @@ static int menu_cbs_init_bind_ok_compare_type(menu_file_list_cbs_t *cbs,
    {
       switch (type)
       {
+         case MENU_SETTING_ACTION_CORE_DISK_OPTIONS:
+            cbs->action_ok = action_ok_push_default;
+            break;
          case MENU_FILE_PLAYLIST_ENTRY:
             cbs->action_ok = action_ok_playlist_entry;
             break;
diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index 0196b0a736..94fbe3270d 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -1575,7 +1575,7 @@ static int menu_displaylist_parse_load_content_settings(menu_displaylist_info_t
          menu_list_push(info->list,
                menu_hash_to_str(MENU_LABEL_VALUE_DISK_OPTIONS),
                menu_hash_to_str(MENU_LABEL_DISK_OPTIONS),
-               MENU_SETTING_ACTION, 0, 0);
+               MENU_SETTING_ACTION_CORE_DISK_OPTIONS, 0, 0);
 #ifdef HAVE_SHADER_MANAGER
       menu_list_push(info->list,
             menu_hash_to_str(MENU_LABEL_VALUE_SHADER_OPTIONS),