diff --git a/frontend/menu/menu_common.c b/frontend/menu/menu_common.c
index 0a6783f13b..1ef7160078 100644
--- a/frontend/menu/menu_common.c
+++ b/frontend/menu/menu_common.c
@@ -644,7 +644,7 @@ unsigned menu_common_type_is(const char *label, unsigned type)
 {
    if (
          type == MENU_SETTINGS ||
-         type == MENU_SETTINGS_GENERAL_OPTIONS ||
+         !strcmp(label, "General Options") ||
          !strcmp(label, "core_options") ||
          !strcmp(label, "core_information") ||
          type == MENU_SETTINGS_VIDEO_OPTIONS ||
diff --git a/frontend/menu/menu_common.h b/frontend/menu/menu_common.h
index 69f8f84629..989b2e6474 100644
--- a/frontend/menu/menu_common.h
+++ b/frontend/menu/menu_common.h
@@ -87,8 +87,7 @@ typedef enum
 typedef enum
 {
    // Shader stuff
-   MENU_SETTINGS_GENERAL_OPTIONS = MENU_SETTINGS + 1,
-   MENU_SETTINGS_VIDEO_OPTIONS,
+   MENU_SETTINGS_VIDEO_OPTIONS = MENU_SETTINGS + 1,
    MENU_SETTINGS_VIDEO_RESOLUTION,
    MENU_SETTINGS_CUSTOM_VIEWPORT,
    MENU_SETTINGS_FONT_OPTIONS,
diff --git a/frontend/menu/menu_entries.c b/frontend/menu/menu_entries.c
index 06de3cd152..a2bfdad91c 100644
--- a/frontend/menu/menu_entries.c
+++ b/frontend/menu/menu_entries.c
@@ -497,7 +497,7 @@ int menu_entries_push_list(menu_handle_t *menu,
          case MENU_SETTINGS_OPTIONS:
             file_list_clear(list);
             add_setting_entry(menu,list,"Driver Options", MENU_FILE_SWITCH, setting_data);
-            add_setting_entry(menu,list,"General Options", MENU_SETTINGS_GENERAL_OPTIONS, setting_data);
+            add_setting_entry(menu,list,"General Options", MENU_FILE_SWITCH, setting_data);
             add_setting_entry(menu,list,"Video Options", MENU_SETTINGS_VIDEO_OPTIONS, setting_data);
             add_setting_entry(menu,list,"Shader Options", MENU_SETTINGS_SHADER_OPTIONS, setting_data);
             add_setting_entry(menu,list,"Font Options", MENU_SETTINGS_FONT_OPTIONS, setting_data);