diff --git a/frontend/menu/menu_entries.c b/frontend/menu/menu_entries.c
index 929e231a31..3b8651d4b5 100644
--- a/frontend/menu/menu_entries.c
+++ b/frontend/menu/menu_entries.c
@@ -247,16 +247,6 @@ int push_list(menu_handle_t *menu,
       for (i = MENU_SETTINGS_BIND_BEGIN; i <= MENU_SETTINGS_BIND_ALL_LAST; i++)
          add_setting_entry(menu, list, input_config_bind_map[i - MENU_SETTINGS_BIND_BEGIN].base, i, menu->list_settings);
    }
-   else if (!strcmp(label, "disk_options"))
-   {
-      file_list_clear(list);
-      file_list_push(list, "Disk Index", "disk_index",
-            MENU_SETTINGS_CORE_DISK_OPTIONS_DISK_INDEX, 0);
-      file_list_push(list, "Disk Cycle Tray Status", "disk_cycle_tray_status",
-            MENU_SETTINGS_CORE_DISK_OPTIONS_DISK_CYCLE_TRAY_STATUS, 0);
-      file_list_push(list, "Disk Image Append", "disk_image_append",
-            MENU_SETTINGS_CORE_DISK_OPTIONS_DISK_IMAGE_APPEND, 0);
-   }
    else if (
          !strcmp(label, "video_shader_preset_parameters") ||
          !strcmp(label, "video_shader_parameters")
diff --git a/frontend/menu/menu_entries_cbs.c b/frontend/menu/menu_entries_cbs.c
index ec52aaf49d..813f9bab78 100644
--- a/frontend/menu/menu_entries_cbs.c
+++ b/frontend/menu/menu_entries_cbs.c
@@ -1702,7 +1702,18 @@ static int deferred_push_disk_options(void *data, void *userdata,
    if (!list || !menu_list)
       return -1;
 
-   return push_list(driver.menu, list, path, label, type);
+   file_list_clear(list);
+   file_list_push(list, "Disk Index", "disk_index",
+         MENU_SETTINGS_CORE_DISK_OPTIONS_DISK_INDEX, 0);
+   file_list_push(list, "Disk Cycle Tray Status", "disk_cycle_tray_status",
+         MENU_SETTINGS_CORE_DISK_OPTIONS_DISK_CYCLE_TRAY_STATUS, 0);
+   file_list_push(list, "Disk Image Append", "disk_image_append",
+         MENU_SETTINGS_CORE_DISK_OPTIONS_DISK_IMAGE_APPEND, 0);
+
+   if (driver.menu_ctx && driver.menu_ctx->populate_entries)
+      driver.menu_ctx->populate_entries(driver.menu, path, label, type);
+
+   return 0;
 }
 
 static int deferred_push_core_list(void *data, void *userdata,