diff --git a/menu/cbs/menu_cbs_select.c b/menu/cbs/menu_cbs_select.c
index 6bf0a70245..585a3ec53b 100644
--- a/menu/cbs/menu_cbs_select.c
+++ b/menu/cbs/menu_cbs_select.c
@@ -37,7 +37,7 @@
 #endif
 
 static int action_select_default(const char *path, const char *label, unsigned type,
-      size_t idx)
+      size_t idx, size_t entry_idx)
 {
    menu_entry_t entry;
    int ret                    = 0;
@@ -111,46 +111,46 @@ static int action_select_default(const char *path, const char *label, unsigned t
 }
 
 static int action_select_path_use_directory(const char *path,
-      const char *label, unsigned type, size_t idx)
+      const char *label, unsigned type, size_t idx, size_t entry_idx)
 {
    return action_ok_path_use_directory(path, label, type, idx, 0 /* unused */);
 }
 
 static int action_select_core_setting(const char *path, const char *label, unsigned type,
-      size_t idx)
+      size_t idx, size_t entry_idx)
 {
    return action_ok_core_option_dropdown_list(path, label, type, idx, 0);
 }
 
 #if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_SLANG) || defined(HAVE_HLSL)
 static int shader_action_parameter_select(const char *path, const char *label, unsigned type,
-      size_t idx)
+      size_t idx, size_t entry_idx)
 {
    return shader_action_parameter_right(type, label, true);
 }
 
 static int shader_action_parameter_preset_select(const char *path, const char *label, unsigned type,
-      size_t idx)
+      size_t idx, size_t entry_idx)
 {
    return shader_action_parameter_right(type, label, true);
 }
 #endif
 
 static int action_select_cheat(const char *path, const char *label, unsigned type,
-      size_t idx)
+      size_t idx, size_t entry_idx)
 {
    return action_right_cheat(type, label, true);
 }
 
 static int action_select_input_desc(const char *path, const char *label, unsigned type,
-      size_t idx)
+      size_t idx, size_t entry_idx)
 {
    return action_right_input_desc(type, label, true);
 }
 
 static int action_select_input_desc_kbd(const char *path,
       const char *label, unsigned type,
-   size_t idx)
+      size_t idx, size_t entry_idx)
 {
    return action_right_input_desc_kbd(type, label, true);
 }
@@ -158,7 +158,7 @@ static int action_select_input_desc_kbd(const char *path,
 #ifdef HAVE_NETWORKING
 static int action_select_netplay_connect_room(const char *path,
       const char *label, unsigned type,
-      size_t idx)
+      size_t idx, size_t entry_idx)
 {
    char tmp_hostname[4115];
 
diff --git a/menu/drivers/menu_generic.c b/menu/drivers/menu_generic.c
index cfa941033e..19753ab608 100644
--- a/menu/drivers/menu_generic.c
+++ b/menu/drivers/menu_generic.c
@@ -385,7 +385,7 @@ int generic_menu_entry_action(
       case MENU_ACTION_SELECT:
          if (cbs && cbs->action_select)
             ret = cbs->action_select(entry->path,
-                  entry->label, entry->type, i);
+                  entry->label, entry->type, i, entry->entry_idx);
          break;
       case MENU_ACTION_SEARCH:
          menu_input_dialog_start_search();
diff --git a/menu/menu_entries.h b/menu/menu_entries.h
index e7e2ae7e78..d3b83768f0 100644
--- a/menu/menu_entries.h
+++ b/menu/menu_entries.h
@@ -107,7 +107,7 @@ typedef struct menu_file_list_cbs
    int (*action_iterate)(const char *label, unsigned action);
    int (*action_deferred_push)(menu_displaylist_info_t *info);
    int (*action_select)(const char *path, const char *label, unsigned type,
-         size_t idx);
+         size_t idx, size_t entry_idx);
    int (*action_get_title)(const char *path, const char *label,
          unsigned type, char *s, size_t len);
    int (*action_ok)(const char *path, const char *label, unsigned type,