diff --git a/frontend/menu/disp/shared.h b/frontend/menu/disp/shared.h
index bc5a786629..2f3c530c6e 100644
--- a/frontend/menu/disp/shared.h
+++ b/frontend/menu/disp/shared.h
@@ -45,7 +45,7 @@ static void get_title(const char *label, const char *dir,
    else if (menu_type == MENU_SETTINGS_SHADER_PRESET_PARAMETERS)
       strlcpy(title, "SHADER PARAMETERS (MENU PRESET)", sizeof_title);
 #endif
-   else if (menu_type == MENU_SETTINGS_FONT_OPTIONS)
+   else if (!strcmp(label, "Font Options"))
       strlcpy(title, "FONT OPTIONS", sizeof_title);
    else if (!strcmp(dir, "General Options"))
       strlcpy(title, "GENERAL OPTIONS", sizeof_title);
diff --git a/frontend/menu/menu_common.c b/frontend/menu/menu_common.c
index a9d7ee0044..1bb16da503 100644
--- a/frontend/menu/menu_common.c
+++ b/frontend/menu/menu_common.c
@@ -648,7 +648,7 @@ unsigned menu_common_type_is(const char *label, unsigned type)
          !strcmp(label, "core_options") ||
          !strcmp(label, "core_information") ||
          !strcmp(label, "Video Options") ||
-         type == MENU_SETTINGS_FONT_OPTIONS ||
+         !strcmp(label, "Font Options") ||
          type == MENU_SETTINGS_SHADER_OPTIONS ||
          type == MENU_SETTINGS_SHADER_PARAMETERS ||
          type == MENU_SETTINGS_SHADER_PRESET_PARAMETERS ||
diff --git a/frontend/menu/menu_common.h b/frontend/menu/menu_common.h
index 290a357457..1d0b1d849d 100644
--- a/frontend/menu/menu_common.h
+++ b/frontend/menu/menu_common.h
@@ -89,7 +89,6 @@ typedef enum
    // Shader stuff
    MENU_SETTINGS_VIDEO_RESOLUTION = MENU_SETTINGS + 1,
    MENU_SETTINGS_CUSTOM_VIEWPORT,
-   MENU_SETTINGS_FONT_OPTIONS,
    MENU_SETTINGS_SHADER_OPTIONS,
    MENU_SETTINGS_SHADER_FILTER,
    MENU_SETTINGS_SHADER_PRESET,
diff --git a/frontend/menu/menu_entries.c b/frontend/menu/menu_entries.c
index 3d86dc5eaa..7cc19b236a 100644
--- a/frontend/menu/menu_entries.c
+++ b/frontend/menu/menu_entries.c
@@ -429,6 +429,12 @@ int menu_entries_push_list(menu_handle_t *menu,
       add_setting_entry(menu,list,"video_refresh_rate", 0, setting_data);
       add_setting_entry(menu,list,"video_refresh_rate_auto", 0, setting_data);
    }
+   else if (!strcmp(label, "Font Options"))
+   {
+      file_list_clear(list);
+      add_setting_entry(menu,list,"video_font_enable", 0, setting_data);
+      add_setting_entry(menu,list,"video_font_size", 0, setting_data);
+   }
    else
    {
       switch (menu_type)
@@ -490,18 +496,13 @@ int menu_entries_push_list(menu_handle_t *menu,
                }
             }
             break;
-         case MENU_SETTINGS_FONT_OPTIONS:
-            file_list_clear(list);
-            add_setting_entry(menu,list,"video_font_enable", 0, setting_data);
-            add_setting_entry(menu,list,"video_font_size", 0, setting_data);
-            break;
          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_FILE_SWITCH, setting_data);
             add_setting_entry(menu,list,"Video Options", MENU_FILE_SWITCH, 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);
+            add_setting_entry(menu,list,"Font Options", MENU_FILE_SWITCH, setting_data);
             add_setting_entry(menu,list,"Audio Options", MENU_FILE_SWITCH, setting_data);
             add_setting_entry(menu,list,"Input Options", MENU_FILE_SWITCH, setting_data);
             add_setting_entry(menu,list,"Overlay Options", MENU_FILE_SWITCH, setting_data);