diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index f176aab442..1ea3be1add 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -2624,7 +2624,6 @@ static bool setting_append_list(
                settings_data_list_current_add_flags(list, list_info, SD_FLAG_IS_DRIVER);
                (*list)[list_info->index - 1].action_left  = setting_string_action_left_driver;
                (*list)[list_info->index - 1].action_right = setting_string_action_right_driver;
-               menu_settings_list_current_add_enum_idx(list, list_info, string_options_entries[i].name_enum_idx);
             }
 
             END_SUB_GROUP(list, list_info, parent_group);
diff --git a/setting_list.c b/setting_list.c
index d74829e6b1..0a20a4b570 100644
--- a/setting_list.c
+++ b/setting_list.c
@@ -1713,6 +1713,8 @@ bool CONFIG_STRING_OPTIONS(
    if (value.name)
       value.name_hash = msg_hash_calculate(value.name);
    (*list)[list_info->index++] = value;
+   menu_settings_list_current_add_enum_idx(list, list_info, name_enum_idx);
+   menu_settings_list_current_add_enum_value_idx(list, list_info, SHORT_enum_idx);
    /* Request values to be freed later */
    settings_data_list_current_add_free_flags(list, list_info, SD_FREE_FLAG_VALUES);