diff --git a/frontend/menu/menu_entries.c b/frontend/menu/menu_entries.c
index 966584c003..34b0a487b3 100644
--- a/frontend/menu/menu_entries.c
+++ b/frontend/menu/menu_entries.c
@@ -197,6 +197,7 @@ int menu_entries_push_list(menu_handle_t *menu,
          !strcmp(label, "General Options") ||
          !strcmp(label, "Overlay Options") ||
          !strcmp(label, "Privacy Options") ||
+         !strcmp(label, "Video Options") ||
          !strcmp(label, "Path Options") ||
          !strcmp(label, "Font Options")
          )
@@ -207,6 +208,16 @@ int menu_entries_push_list(menu_handle_t *menu,
 
       file_list_clear(list);
 
+      if (!strcmp(label, "Video Options"))
+      {
+#if defined(GEKKO) || defined(__CELLOS_LV2__)
+         file_list_push(list, "Screen Resolution", "",
+               MENU_SETTINGS_VIDEO_RESOLUTION, 0);
+#endif
+         file_list_push(list, "Custom Ratio", "",
+               MENU_SETTINGS_CUSTOM_VIEWPORT, 0);
+      }
+
       for (; setting->type != ST_END_GROUP; setting++)
       {
          if (
@@ -465,42 +476,6 @@ int menu_entries_push_list(menu_handle_t *menu,
       for (i = MENU_SETTINGS_BIND_BEGIN; i <= MENU_SETTINGS_BIND_ALL_LAST; i++)
          add_setting_entry(menu, list, input_config_bind_map[i - MENU_SETTINGS_BIND_BEGIN].base, i, setting_data);
    }
-   else if (!strcmp(label, "Video Options"))
-   {
-      file_list_clear(list);
-      add_setting_entry(menu,list,"video_shared_context", 0, setting_data);
-#if defined(GEKKO) || defined(__CELLOS_LV2__)
-      file_list_push(list, "Screen Resolution", "",
-            MENU_SETTINGS_VIDEO_RESOLUTION, 0);
-#endif
-      add_setting_entry(menu,list,"video_viwidth", 0, setting_data);
-      add_setting_entry(menu,list,"video_filter", 0, setting_data);
-      add_setting_entry(menu,list, "pal60_enable", 0, setting_data);
-      add_setting_entry(menu,list,"video_smooth", 0, setting_data);
-      add_setting_entry(menu,list, "soft_filter", 0, setting_data);
-      add_setting_entry(menu,list,"video_gamma", 0, setting_data);
-      add_setting_entry(menu,list,"video_filter_flicker", 0,
-            setting_data);
-      add_setting_entry(menu,list,"video_scale_integer", 0, setting_data);
-      add_setting_entry(menu,list,"aspect_ratio_index", 0, setting_data);
-      file_list_push(list, "Custom Ratio", "",
-            MENU_SETTINGS_CUSTOM_VIEWPORT, 0);
-      add_setting_entry(menu,list,"video_fullscreen", 0, setting_data);
-      add_setting_entry(menu,list,"video_windowed_fullscreen", 0, setting_data);
-      add_setting_entry(menu,list,"video_rotation", 0, setting_data);
-      add_setting_entry(menu,list,"video_vsync", 0, setting_data);
-      add_setting_entry(menu,list,"video_hard_sync", 0, setting_data);
-      add_setting_entry(menu,list,"video_hard_sync_frames", 0, setting_data);
-      add_setting_entry(menu,list,"video_frame_delay", 0, setting_data);
-      add_setting_entry(menu,list,"video_black_frame_insertion", 0, setting_data);
-      add_setting_entry(menu,list,"video_swap_interval", 0, setting_data);
-      add_setting_entry(menu,list,"video_threaded", 0, setting_data);
-      add_setting_entry(menu,list,"video_scale", 0, setting_data);
-      add_setting_entry(menu,list,"video_crop_overscan", 0, setting_data);
-      add_setting_entry(menu,list,"video_monitor_index", 0, setting_data);
-      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, "Shader Options"))
    {
       struct gfx_shader *shader = (struct gfx_shader*)menu->shader;