diff --git a/frontend/menu/disp/shared.h b/frontend/menu/disp/shared.h
index 557ac6800a..39c09a6b47 100644
--- a/frontend/menu/disp/shared.h
+++ b/frontend/menu/disp/shared.h
@@ -19,7 +19,7 @@ static void get_title(const char *label, const char *dir,
          menu_type == MENU_SETTINGS_CUSTOM_BIND ||
          menu_type == MENU_SETTINGS_CUSTOM_BIND_KEYBOARD)
       strlcpy(title, "INPUT OPTIONS", sizeof_title);
-   else if (menu_type == MENU_SETTINGS_OVERLAY_OPTIONS)
+   else if (!strcmp(label, "Overlay Options"))
       strlcpy(title, "OVERLAY OPTIONS", sizeof_title);
    else if (!strcmp(label, "Netplay Options"))
       strlcpy(title, "NETPLAY OPTIONS", sizeof_title);
diff --git a/frontend/menu/menu_common.c b/frontend/menu/menu_common.c
index 65fdaf332e..b2367e7e98 100644
--- a/frontend/menu/menu_common.c
+++ b/frontend/menu/menu_common.c
@@ -656,7 +656,7 @@ unsigned menu_common_type_is(const char *label, unsigned type)
          type == MENU_SETTINGS_DISK_OPTIONS ||
          type == MENU_SETTINGS_PATH_OPTIONS ||
          !strcmp(label, "Privacy Options") ||
-         type == MENU_SETTINGS_OVERLAY_OPTIONS ||
+         !strcmp(label, "Overlay Options") ||
          !strcmp(label, "User Options") ||
          !strcmp(label, "Netplay Options") ||
          type == MENU_SETTINGS_OPTIONS ||
diff --git a/frontend/menu/menu_common.h b/frontend/menu/menu_common.h
index 75f73be89c..76f70931d5 100644
--- a/frontend/menu/menu_common.h
+++ b/frontend/menu/menu_common.h
@@ -112,7 +112,6 @@ typedef enum
    MENU_SETTINGS_AUDIO_OPTIONS,
    MENU_SETTINGS_INPUT_OPTIONS,
    MENU_SETTINGS_PATH_OPTIONS,
-   MENU_SETTINGS_OVERLAY_OPTIONS,
    MENU_SETTINGS_OPTIONS,
    MENU_SETTINGS_DRIVERS,
    MENU_SETTINGS_DISK_OPTIONS,
diff --git a/frontend/menu/menu_entries.c b/frontend/menu/menu_entries.c
index b43126f1f7..279dd63b2d 100644
--- a/frontend/menu/menu_entries.c
+++ b/frontend/menu/menu_entries.c
@@ -321,6 +321,13 @@ int menu_entries_push_list(menu_handle_t *menu,
       add_setting_entry(menu,list,"camera_allow", 0, setting_data);
       add_setting_entry(menu,list,"location_allow", 0, setting_data);
    }
+   else if (!strcmp(label, "Overlay Options"))
+   {
+      file_list_clear(list);
+      add_setting_entry(menu,list,"input_overlay", 0, setting_data);
+      add_setting_entry(menu,list,"input_overlay_opacity", 0, setting_data);
+      add_setting_entry(menu,list,"input_overlay_scale", 0, setting_data);
+   }
    else
    {
       switch (menu_type)
@@ -448,8 +455,7 @@ int menu_entries_push_list(menu_handle_t *menu,
             add_setting_entry(menu,list,"Font Options", MENU_SETTINGS_FONT_OPTIONS, setting_data);
             add_setting_entry(menu,list,"Audio Options", MENU_SETTINGS_AUDIO_OPTIONS, setting_data);
             add_setting_entry(menu,list,"Input Options", MENU_SETTINGS_INPUT_OPTIONS, setting_data);
-            add_setting_entry(menu,list,"Overlay Options", MENU_SETTINGS_OVERLAY_OPTIONS,
-                  setting_data);
+            add_setting_entry(menu,list,"Overlay Options", MENU_FILE_SWITCH, setting_data);
             add_setting_entry(menu,list,"User Options", MENU_FILE_SWITCH, setting_data);
             add_setting_entry(menu,list,"Netplay Options", MENU_FILE_SWITCH, setting_data);
             add_setting_entry(menu,list,"Path Options", MENU_SETTINGS_PATH_OPTIONS, setting_data);
@@ -469,12 +475,6 @@ int menu_entries_push_list(menu_handle_t *menu,
             file_list_push(list, "Disk Image Append", "",
                   MENU_SETTINGS_DISK_APPEND, 0);
             break;
-         case MENU_SETTINGS_OVERLAY_OPTIONS:
-            file_list_clear(list);
-            add_setting_entry(menu,list,"input_overlay", 0, setting_data);
-            add_setting_entry(menu,list,"input_overlay_opacity", 0, setting_data);
-            add_setting_entry(menu,list,"input_overlay_scale", 0, setting_data);
-            break;
          case MENU_SETTINGS_PATH_OPTIONS:
             file_list_clear(list);
             add_setting_entry(menu,list,"rgui_browser_directory", 0, setting_data);