diff --git a/frontend/menu/backend/menu_common_backend.c b/frontend/menu/backend/menu_common_backend.c
index 0ce05b001b..9763738cb1 100644
--- a/frontend/menu/backend/menu_common_backend.c
+++ b/frontend/menu/backend/menu_common_backend.c
@@ -2304,9 +2304,8 @@ static void menu_common_setting_set_label(char *type_str,
             else
                strlcpy(type_str, "<default>", type_str_size);
          }
-         else if (
-               type == MENU_SETTINGS_SAVESTATE_SAVE ||
-               type == MENU_SETTINGS_SAVESTATE_LOAD)
+         else if (!strcmp(setting->name, "savestate") ||
+               !strcmp(setting->name, "loadstate"))
          {
             if (g_settings.state_slot < 0)
                strlcpy(type_str, "-1 (auto)", type_str_size);
diff --git a/frontend/menu/menu_common.h b/frontend/menu/menu_common.h
index 8234e7379b..64cfdb2171 100644
--- a/frontend/menu/menu_common.h
+++ b/frontend/menu/menu_common.h
@@ -126,8 +126,6 @@ typedef enum
    MENU_SETTINGS_PERFORMANCE_COUNTERS,
    MENU_SETTINGS_PERFORMANCE_COUNTERS_LIBRETRO,
    MENU_SETTINGS_PERFORMANCE_COUNTERS_FRONTEND,
-   MENU_SETTINGS_SAVESTATE_SAVE,
-   MENU_SETTINGS_SAVESTATE_LOAD,
    MENU_SETTINGS_DISK_OPTIONS,
    MENU_SETTINGS_DISK_INDEX,
    MENU_SETTINGS_DISK_APPEND,
diff --git a/frontend/menu/menu_entries.c b/frontend/menu/menu_entries.c
index d1ddce8958..072b16a380 100644
--- a/frontend/menu/menu_entries.c
+++ b/frontend/menu/menu_entries.c
@@ -84,8 +84,8 @@ int menu_entries_push(menu_handle_t *menu,
       add_setting_entry(menu,"core_information", MENU_SETTINGS_CORE_INFO, setting_data);
       add_setting_entry(menu,"settings", MENU_SETTINGS_OPTIONS, setting_data);
       add_setting_entry(menu,"performance_counters", MENU_SETTINGS_PERFORMANCE_COUNTERS, setting_data);
-      add_setting_entry(menu,"savestate", MENU_SETTINGS_SAVESTATE_SAVE, setting_data);
-      add_setting_entry(menu,"loadstate", MENU_SETTINGS_SAVESTATE_LOAD, setting_data);
+      add_setting_entry(menu,"savestate", 0, setting_data);
+      add_setting_entry(menu,"loadstate", 0, setting_data);
       add_setting_entry(menu,"take_screenshot", 0, setting_data);
       add_setting_entry(menu,"resume_content", 0, setting_data);
       add_setting_entry(menu,"restart_content", 0, setting_data);