diff --git a/ui/xui/main-menu.cc b/ui/xui/main-menu.cc
index f29b0139832..eb7749a51b1 100644
--- a/ui/xui/main-menu.cc
+++ b/ui/xui/main-menu.cc
@@ -989,6 +989,10 @@ void MainMenuSystemView::Draw()
         ImGui::TextColored(ImVec4(1,0,0,1), "Application restart required to apply settings");
     }
 
+    if ((int)g_config.sys.avpack == CONFIG_SYS_AVPACK_NONE) {
+        ImGui::TextColored(ImVec4(1,0,0,1), "Setting AV Pack to NONE disables video output.");
+    }
+
     SectionTitle("System Configuration");
 
     if (ChevronCombo(
@@ -1184,34 +1188,21 @@ MainMenuScene::MainMenuScene()
     m_next_view_index = m_current_view_index;
 }
 
-void MainMenuScene::ShowGeneral()
-{
-    SetNextViewIndexWithFocus(0);
-}
-void MainMenuScene::ShowInput()
+void MainMenuScene::ShowSettings()
 {
-    SetNextViewIndexWithFocus(1);
+    SetNextViewIndexWithFocus(g_config.general.last_viewed_menu_index);
 }
-void MainMenuScene::ShowDisplay()
-{
-    SetNextViewIndexWithFocus(2);
-}
-void MainMenuScene::ShowAudio()
-{
-    SetNextViewIndexWithFocus(3);
-}
-void MainMenuScene::ShowNetwork()
-{
-    SetNextViewIndexWithFocus(4);
-}
-void MainMenuScene::ShowSnapshots() 
+
+void MainMenuScene::ShowSnapshots()
 {
     SetNextViewIndexWithFocus(5);
 }
+
 void MainMenuScene::ShowSystem()
 {
     SetNextViewIndexWithFocus(6);
 }
+
 void MainMenuScene::ShowAbout()
 {
     SetNextViewIndexWithFocus(7);
diff --git a/ui/xui/main-menu.hh b/ui/xui/main-menu.hh
index 7be564701ca..bce3927333c 100644
--- a/ui/xui/main-menu.hh
+++ b/ui/xui/main-menu.hh
@@ -182,14 +182,10 @@ protected:
 
 public:
     MainMenuScene();
-    void ShowGeneral();
-    void ShowInput();
-    void ShowDisplay();
-    void ShowAudio();
-    void ShowNetwork();
-    void ShowSnapshots();
+    void ShowSettings();
     void ShowSystem();
     void ShowAbout();
+    void ShowSnapshots();
     void SetNextViewIndexWithFocus(int i);
     void Show() override;
     void Hide() override;
diff --git a/ui/xui/menubar.cc b/ui/xui/menubar.cc
index 2afcc367c52..2d1f48c6045 100644
--- a/ui/xui/menubar.cc
+++ b/ui/xui/menubar.cc
@@ -138,14 +138,7 @@ void ShowMainMenu()
 
             ImGui::Separator();
 
-            ImGui::MenuItem("Settings", NULL, false, false);
-            if (ImGui::MenuItem(" General")) g_main_menu.ShowGeneral();
-            if (ImGui::MenuItem(" Input")) g_main_menu.ShowInput();
-            if (ImGui::MenuItem(" Display")) g_main_menu.ShowDisplay();
-            if (ImGui::MenuItem(" Audio")) g_main_menu.ShowAudio();
-            if (ImGui::MenuItem(" Network")) g_main_menu.ShowNetwork();
-            if (ImGui::MenuItem(" Snapshots")) g_main_menu.ShowSnapshots();
-            if (ImGui::MenuItem(" System")) g_main_menu.ShowSystem();
+            if (ImGui::MenuItem("Settings...")) g_main_menu.ShowSettings();
 
             ImGui::Separator();