diff --git a/menu/menu_entries.c b/menu/menu_entries.c
index c02043b8b0..a2eef81c6d 100644
--- a/menu/menu_entries.c
+++ b/menu/menu_entries.c
@@ -568,7 +568,8 @@ void menu_entries_add_enum(file_list_t *list, const char *path, const char *labe
 
    file_list_set_actiondata(list, idx, cbs);
 
-   cbs->setting = menu_setting_find_enum(enum_idx);
+   cbs->enum_idx = enum_idx ;
+   cbs->setting  = menu_setting_find_enum(enum_idx);
 
    menu_cbs_init(list, cbs, path, label, type, idx);
 }
diff --git a/menu/menu_entries.h b/menu/menu_entries.h
index 2df1ee06c7..57daa4bba1 100644
--- a/menu/menu_entries.h
+++ b/menu/menu_entries.h
@@ -61,6 +61,7 @@ enum menu_entries_ctl_state
 typedef struct menu_file_list_cbs
 {
    rarch_setting_t *setting;
+   enum menu_hash_enums enum_idx;
 
    int (*action_iterate)(const char *label, unsigned action);
    const char *action_iterate_ident;