diff --git a/ui/xui/main-menu.cc b/ui/xui/main-menu.cc
index bdaf46dc6a3..f04e15f997c 100644
--- a/ui/xui/main-menu.cc
+++ b/ui/xui/main-menu.cc
@@ -1189,6 +1189,11 @@ void MainMenuScene::ShowSettings()
     SetNextViewIndexWithFocus(m_current_view_index);
 }
 
+void MainMenuScene::ShowSystem()
+{
+    SetNextViewIndexWithFocus(6);
+}
+
 void MainMenuScene::SetNextViewIndexWithFocus(int i)
 {
     m_focus_view = true;
diff --git a/ui/xui/main-menu.hh b/ui/xui/main-menu.hh
index f2d7958bc2d..1953d8b00f5 100644
--- a/ui/xui/main-menu.hh
+++ b/ui/xui/main-menu.hh
@@ -183,6 +183,7 @@ protected:
 public:
     MainMenuScene();
     void ShowSettings();
+    void ShowSystem();
     void SetNextViewIndexWithFocus(int i);
     void Show() override;
     void Hide() override;
diff --git a/ui/xui/welcome.cc b/ui/xui/welcome.cc
index ba34ca186d6..6a83079ff10 100644
--- a/ui/xui/welcome.cc
+++ b/ui/xui/welcome.cc
@@ -58,7 +58,7 @@ void FirstBootWindow::Draw()
 
     ImGui::SetCursorPosX((ImGui::GetWindowWidth()-120*g_viewport_mgr.m_scale)/2);
     if (ImGui::Button("Settings", ImVec2(120*g_viewport_mgr.m_scale, 0))) {
-        g_main_menu.ShowSettings();
+        g_main_menu.ShowSystem();
         g_config.general.show_welcome = false;
     }