diff --git a/source/main/gui/panels/GUI_GameSettings.cpp b/source/main/gui/panels/GUI_GameSettings.cpp
index 7b94cdc33c..47fd0ae937 100644
--- a/source/main/gui/panels/GUI_GameSettings.cpp
+++ b/source/main/gui/panels/GUI_GameSettings.cpp
@@ -34,402 +34,439 @@ using namespace GUI;
 
 void GameSettings::Draw()
 {
-    const int flags = ImGuiWindowFlags_NoCollapse;
+    const int flags = ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoScrollbar;
     ImGui::SetNextWindowSize(ImVec2(670.f, 400.f), ImGuiCond_FirstUseEver);
     ImGui::SetNextWindowPosCenter(ImGuiCond_Appearing);
     bool keep_open = true;
     ImGui::Begin(_LC("GameSettings", "Game settings"), &keep_open, flags);
 
-    // 'Tabs' buttons
-    ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(4.f, 8.f));
+    ImGui::BeginTabBar("GameSettingsTabs");
 
-    if (ImGui::Button(_LC("GameSettings", "Render System"))) { m_tab = SettingsTab::RENDER_SYSTEM; }
-    ImGui::SameLine();
-    if (ImGui::Button(_LC("GameSettings", "General")))       { m_tab = SettingsTab::GENERAL;       }
-    ImGui::SameLine();
-    if (ImGui::Button(_LC("GameSettings", "Graphics")))      { m_tab = SettingsTab::GRAPHICS;      }
-    ImGui::SameLine();
-#ifdef USE_OPENAL
-    if (ImGui::Button(_LC("GameSettings", "Audio")))         { m_tab = SettingsTab::AUDIO;         }
-    ImGui::SameLine();
-#endif // USE_OPENAL
-    if (ImGui::Button(_LC("GameSettings", "Controls")))      { m_tab = SettingsTab::CONTROL;       }
-    ImGui::SameLine();
-    if (ImGui::Button(_LC("GameSettings", "Diagnostic")))    { m_tab = SettingsTab::DIAG;          }
-    ImGui::SameLine();
-    if (ImGui::Button(_LC("GameSettings", "Update cache")))
+    if (ImGui::BeginTabItem(_LC("GameSettings", "Render System")))
     {
-        App::GetGuiManager()->SetVisible_GameSettings(false);
-        App::GetGameContext()->PushMessage(Message(MSG_APP_MODCACHE_UPDATE_REQUESTED));
-        App::GetGameContext()->PushMessage(Message(MSG_GUI_OPEN_MENU_REQUESTED));
+        ImGui::BeginChild("Settings-Render-scroll");
+        this->DrawRenderSystemSettings();
+        ImGui::EndChild();
+        ImGui::EndTabItem();
+    }
+    if (ImGui::BeginTabItem(_LC("GameSettings", "General")))
+    {
+        ImGui::BeginChild("Settings-General-scroll");
+        this->DrawGeneralSettings();
+        ImGui::EndChild();
+        ImGui::EndTabItem();
+    }
+    if (ImGui::BeginTabItem(_LC("GameSettings", "Gameplay")))
+    {
+        ImGui::BeginChild("Settings-Gameplay-scroll");
+        this->DrawGameplaySettings();
+        ImGui::EndChild();
+        ImGui::EndTabItem();
+    }
+    if (ImGui::BeginTabItem(_LC("GameSettings", "Graphics")))
+    {
+        ImGui::BeginChild("Settings-Graphics-scroll");
+        this->DrawGraphicsSettings();
+        ImGui::EndChild();
+        ImGui::EndTabItem();
+    }
+    if (ImGui::BeginTabItem(_LC("GameSettings", "Audio")))
+    {
+        ImGui::BeginChild("Settings-Audio-scroll");
+        this->DrawAudioSettings();
+        ImGui::EndChild();
+        ImGui::EndTabItem();
+    }
+    if (ImGui::BeginTabItem(_LC("GameSettings", "Controls")))
+    {
+        ImGui::BeginChild("Settings-Controls-scroll");
+        this->DrawControlSettings();
+        ImGui::EndChild();
+        ImGui::EndTabItem();
+    }
+    if (ImGui::BeginTabItem(_LC("GameSettings", "Diagnostic")))
+    {
+        ImGui::BeginChild("Settings-Diag-scroll");
+        this->DrawDiagSettings();
+        ImGui::EndChild();
+        ImGui::EndTabItem();
     }
 
-    ImGui::PopStyleVar(1);
+    ImGui::EndTabBar();
 
     ImGui::SetCursorPosY(ImGui::GetCursorPosY() + 4.f);
-    ImGui::Separator();
 
-    if (m_tab == SettingsTab::RENDER_SYSTEM)
+    App::GetGuiManager()->RequestGuiCaptureKeyboard(ImGui::IsWindowHovered());
+    ImGui::End();
+    if (!keep_open)
     {
-        ImGui::TextDisabled("%s", _LC("GameSettings", "Render system (changes require a restart)"));
+        this->SetVisible(false);
+    }
+}
 
-        const auto ogre_root = App::GetAppContext()->GetOgreRoot();
-        const auto render_systems = ogre_root->getAvailableRenderers();
-        std::string render_system_names;
-        for (auto rs : render_systems)
-        {
-            render_system_names += rs->getName() + '\0';
-        }
-        const auto ro = ogre_root->getRenderSystemByName(App::app_rendersys_override->GetStr());
-        const auto rs = ro ? ro : ogre_root->getRenderSystem();
-        const auto it = std::find(render_systems.begin(), render_systems.end(), rs);
-        int render_id = it != render_systems.end() ? std::distance(render_systems.begin(), it) : 0;
-        /* Combobox for selecting the Render System*/
-        if (ImGui::Combo(_LC ("GameSettings", "Render System"), &render_id, render_system_names.c_str()))
+void GameSettings::DrawRenderSystemSettings()
+{
+    ImGui::TextDisabled("%s", _LC("GameSettings", "Render system (changes require a restart)"));
+
+    const auto ogre_root = App::GetAppContext()->GetOgreRoot();
+    const auto render_systems = ogre_root->getAvailableRenderers();
+    std::string render_system_names;
+    for (auto rs : render_systems)
+    {
+        render_system_names += rs->getName() + '\0';
+    }
+    const auto ro = ogre_root->getRenderSystemByName(App::app_rendersys_override->GetStr());
+    const auto rs = ro ? ro : ogre_root->getRenderSystem();
+    const auto it = std::find(render_systems.begin(), render_systems.end(), rs);
+    int render_id = it != render_systems.end() ? std::distance(render_systems.begin(), it) : 0;
+    /* Combobox for selecting the Render System*/
+    if (ImGui::Combo(_LC ("GameSettings", "Render System"), &render_id, render_system_names.c_str()))
+    {
+        App::app_rendersys_override->SetStr(render_systems[render_id]->getName());
+    }
+
+    const auto config_options = ogre_root->getRenderSystem()->getConfigOptions();
+    std::set<std::string> filter = {"Allow NVPerfHUD", "Colour Depth", "Fixed Pipeline Enabled",
+        "Floating-point mode", "Resource Creation Policy", "VSync Interval", "sRGB Gamma Conversion"};
+    for (auto opt : config_options)
+    {
+        auto co = opt.second;
+        if (co.immutable)
+            continue;
+        if (co.possibleValues.empty())
+            continue;
+        if (filter.find(co.name) != filter.end())
+            continue;
+        std::sort(co.possibleValues.rbegin(), co.possibleValues.rend());
+        std::string option_values;
+        for (auto value : co.possibleValues)
         {
-            App::app_rendersys_override->SetStr(render_systems[render_id]->getName());
+            option_values += value + '\0';
         }
-
-        const auto config_options = ogre_root->getRenderSystem()->getConfigOptions();
-        std::set<std::string> filter = {"Allow NVPerfHUD", "Colour Depth", "Fixed Pipeline Enabled",
-            "Floating-point mode", "Resource Creation Policy", "VSync Interval", "sRGB Gamma Conversion"};
-        for (auto opt : config_options)
+        const auto it = std::find(co.possibleValues.begin(), co.possibleValues.end(), opt.second.currentValue);
+        int option_id = it != co.possibleValues.end() ? std::distance(co.possibleValues.begin(), it) : 0;
+        if (ImGui::Combo(co.name.c_str(), &option_id, option_values.c_str()))
         {
-            auto co = opt.second;
-            if (co.immutable)
-                continue;
-            if (co.possibleValues.empty())
-                continue;
-            if (filter.find(co.name) != filter.end())
-                continue;
-            std::sort(co.possibleValues.rbegin(), co.possibleValues.rend());
-            std::string option_values;
-            for (auto value : co.possibleValues)
+            rs->setConfigOption(co.name, co.possibleValues[option_id]);
+            if (rs->validateConfigOptions().empty())
             {
-                option_values += value + '\0';
-            }
-            const auto it = std::find(co.possibleValues.begin(), co.possibleValues.end(), opt.second.currentValue);
-            int option_id = it != co.possibleValues.end() ? std::distance(co.possibleValues.begin(), it) : 0;
-            if (ImGui::Combo(co.name.c_str(), &option_id, option_values.c_str()))
-            {
-                rs->setConfigOption(co.name, co.possibleValues[option_id]);
-                if (rs->validateConfigOptions().empty())
-                {
-                    ogre_root->saveConfig();
-                }
+                ogre_root->saveConfig();
             }
         }
     }
-    else if (m_tab == SettingsTab::GENERAL)
-    {
-        ImGui::TextDisabled("%s", _LC("GameSettings", "Application settings"));
+}
+
+void GameSettings::DrawGeneralSettings()
+{
+    ImGui::TextDisabled("%s", _LC("GameSettings", "Application settings"));
 
 #ifndef NOLANG
-        std::vector<std::pair<std::string, std::string>> languages = App::GetLanguageEngine()->getLanguages();
-        std::string lang_values;
-        for (auto value : languages)
-        {
-            lang_values += value.first + '\0';
-        }
-        const auto it = std::find_if(languages.begin(), languages.end(),
-                [](const std::pair<std::string, std::string>& l) { return l.second == App::app_language->GetStr(); });
-        int lang_selection = it != languages.end() ? std::distance(languages.begin(), it) : 0;
-        if (ImGui::Combo(_LC("GameSettings", "Language"), &lang_selection, lang_values.c_str()))
-        {
-            App::app_language->SetStr(languages[lang_selection].second);
-            App::GetLanguageEngine()->setup();
-        }
+    std::vector<std::pair<std::string, std::string>> languages = App::GetLanguageEngine()->getLanguages();
+    std::string lang_values;
+    for (auto value : languages)
+    {
+        lang_values += value.first + '\0';
+    }
+    const auto it = std::find_if(languages.begin(), languages.end(),
+            [](const std::pair<std::string, std::string>& l) { return l.second == App::app_language->GetStr(); });
+    int lang_selection = it != languages.end() ? std::distance(languages.begin(), it) : 0;
+    if (ImGui::Combo(_LC("GameSettings", "Language"), &lang_selection, lang_values.c_str()))
+    {
+        App::app_language->SetStr(languages[lang_selection].second);
+        App::GetLanguageEngine()->setup();
+    }
 #endif
 
-        // Country selection
-        static Ogre::FileInfoListPtr fl = Ogre::ResourceGroupManager::getSingleton().findResourceFileInfo("FlagsRG", "*");
-        if (!fl->empty())
+    // Country selection
+    static Ogre::FileInfoListPtr fl = Ogre::ResourceGroupManager::getSingleton().findResourceFileInfo("FlagsRG", "*");
+    if (!fl->empty())
+    {
+        static std::vector<std::string> countries;
+        if (countries.empty())
         {
-            static std::vector<std::string> countries;
-            if (countries.empty())
+            for (auto& file : *fl)
             {
-                for (auto& file : *fl)
+                std::string country = Ogre::StringUtil::replaceAll(file.filename, ".png", "");
+                if (country.size() == 2) // RoR protocol limitation
                 {
-                    std::string country = Ogre::StringUtil::replaceAll(file.filename, ".png", "");
-                    if (country.size() == 2) // RoR protocol limitation
-                    {
-                        countries.push_back(country);
-                    }
+                    countries.push_back(country);
                 }
-                std::sort(countries.begin(), countries.end());
-            }
-            std::string country_values;
-            for (auto value : countries)
-            {
-                country_values += value + '\0';
-            }
-            const auto it = std::find(countries.begin(), countries.end(), App::app_country->GetStr());
-            int country_selection = it != countries.end() ? std::distance(countries.begin(), it) : 0;
-            if (ImGui::Combo(_LC("GameSettings", "Country"), &country_selection, country_values.c_str()))
-            {
-                App::app_country->SetStr(countries[country_selection].c_str());
             }
+            std::sort(countries.begin(), countries.end());
         }
-
-        int sshot_select = (App::app_screenshot_format->GetStr() == "jpg") ? 1 : 0; // Hardcoded; TODO: list available formats.
-
-        /* Screenshot format: Can be png or jpg*/
-        if (ImGui::Combo(_LC("GameSettings", "Screenshot format"), &sshot_select, "png\0jpg\0\0"))
+        std::string country_values;
+        for (auto value : countries)
         {
-            std::string str = (sshot_select == 1) ? "jpg" : "png";
-            App::app_screenshot_format->SetStr(str);
+            country_values += value + '\0';
         }
+        const auto it = std::find(countries.begin(), countries.end(), App::app_country->GetStr());
+        int country_selection = it != countries.end() ? std::distance(countries.begin(), it) : 0;
+        if (ImGui::Combo(_LC("GameSettings", "Country"), &country_selection, country_values.c_str()))
+        {
+            App::app_country->SetStr(countries[country_selection].c_str());
+        }
+    }
 
-        DrawGTextEdit(App::app_extra_mod_path, _LC("GameSettings", "Extra mod path"),  m_buf_app_extra_mod_dir);
-
-        DrawGCheckbox(App::app_skip_main_menu, _LC("GameSettings", "Skip main menu"));
-        DrawGCheckbox(App::app_async_physics, _LC("GameSettings", "Async physics"));
-        DrawGCheckbox(App::app_disable_online_api, _LC("GameSettings", "Disable online api"));
+    int sshot_select = (App::app_screenshot_format->GetStr() == "jpg") ? 1 : 0; // Hardcoded; TODO: list available formats.
 
-        ImGui::Separator();
-        ImGui::TextDisabled("%s", _LC("GameSettings", "Simulation settings"));
+    /* Screenshot format: Can be png or jpg*/
+    if (ImGui::Combo(_LC("GameSettings", "Screenshot format"), &sshot_select, "png\0jpg\0\0"))
+    {
+        std::string str = (sshot_select == 1) ? "jpg" : "png";
+        App::app_screenshot_format->SetStr(str);
+    }
 
-        DrawGCombo(App::sim_gearbox_mode, _LC("GameSettings", "Gearbox mode"),
-            "Automatic shift\0"
-            "Manual shift - Auto clutch\0"
-            "Fully Manual: sequential shift\0"
-            "Fully manual: stick shift\0"
-            "Fully Manual: stick shift with ranges\00");
+    DrawGTextEdit(App::app_extra_mod_path, _LC("GameSettings", "Extra mod path"),  m_buf_app_extra_mod_dir);
 
-        DrawGCheckbox(App::gfx_speedo_digital, _LC("GameSettings", "Digital speedometer"));
-        DrawGCheckbox(App::gfx_speedo_imperial, _LC("GameSettings", "Imperial speedometer"));
+    DrawGCheckbox(App::app_skip_main_menu, _LC("GameSettings", "Skip main menu"));
+    DrawGCheckbox(App::app_async_physics, _LC("GameSettings", "Async physics"));
+    DrawGCheckbox(App::app_disable_online_api, _LC("GameSettings", "Disable online api"));
 
-        //DrawGCheckbox(App::gfx_flexbody_cache,     "Enable flexbody cache");
+    if (ImGui::Button(_LC("GameSettings", "Update cache")))
+    {
+        App::GetGuiManager()->SetVisible_GameSettings(false);
+        App::GetGameContext()->PushMessage(Message(MSG_APP_MODCACHE_UPDATE_REQUESTED));
+        App::GetGameContext()->PushMessage(Message(MSG_GUI_OPEN_MENU_REQUESTED));
+    }
+}
 
-        DrawGCheckbox(App::sim_spawn_running, _LC("GameSettings", "Engines spawn running"));
+void GameSettings::DrawGameplaySettings()
+{
+    ImGui::TextDisabled("%s", _LC("GameSettings", "Simulation settings"));
 
-        DrawGCheckbox(App::sim_replay_enabled, _LC("GameSettings", "Replay mode"));
-        if (App::sim_replay_enabled->GetBool())
-        {
-            DrawGIntBox(App::sim_replay_length, _LC("GameSettings", "Replay length"));
-            DrawGIntBox(App::sim_replay_stepping, _LC("GameSettings", "Replay stepping"));
-        }
+    DrawGCombo(App::sim_gearbox_mode, _LC("GameSettings", "Gearbox mode"),
+        "Automatic shift\0"
+        "Manual shift - Auto clutch\0"
+        "Fully Manual: sequential shift\0"
+        "Fully manual: stick shift\0"
+        "Fully Manual: stick shift with ranges\00");
 
-        DrawGCheckbox(App::sim_realistic_commands, _LC("GameSettings", "Realistic forward commands"));
+    DrawGCheckbox(App::gfx_speedo_digital, _LC("GameSettings", "Digital speedometer"));
+    DrawGCheckbox(App::gfx_speedo_imperial, _LC("GameSettings", "Imperial speedometer"));
 
-        DrawGCheckbox(App::sim_races_enabled, _LC("GameSettings", "Enable races"));
+    //DrawGCheckbox(App::gfx_flexbody_cache,     "Enable flexbody cache");
 
-        DrawGCheckbox(App::sim_no_self_collisions, _LC("GameSettings", "No intra truck collisions"));
-        DrawGCheckbox(App::sim_no_collisions, _LC("GameSettings", "No inter truck collisions"));
+    DrawGCheckbox(App::sim_spawn_running, _LC("GameSettings", "Engines spawn running"));
 
-        DrawGCheckbox(App::io_discord_rpc, _LC("GameSettings", "Discord Rich Presence"));
-    }
-#ifdef USE_OPENAL
-    else if (m_tab == SettingsTab::AUDIO)
+    DrawGCheckbox(App::sim_replay_enabled, _LC("GameSettings", "Replay mode"));
+    if (App::sim_replay_enabled->GetBool())
     {
-        ImGui::TextDisabled("%s", _LC("GameSettings", "Audio settings"));
+        DrawGIntBox(App::sim_replay_length, _LC("GameSettings", "Replay length"));
+        DrawGIntBox(App::sim_replay_stepping, _LC("GameSettings", "Replay stepping"));
+    }
 
-        static const ALCchar *devices = alcGetString(NULL, ALC_ALL_DEVICES_SPECIFIER);
-        const ALCchar *device = devices, *next = devices + 1;
-        std::vector<std::string> audio_devices;
+    DrawGCheckbox(App::sim_realistic_commands, _LC("GameSettings", "Realistic forward commands"));
 
-        while (device && *device != '\0' && next && *next != '\0')
-        {
-                audio_devices.push_back(device);
-                size_t len = strlen(device);
-                device += (len + 1);
-                next += (len + 2);
-        }
+    DrawGCheckbox(App::sim_races_enabled, _LC("GameSettings", "Enable races"));
 
-        const auto it = std::find(audio_devices.begin(), audio_devices.end(), App::audio_device_name->GetStr());
-        int device_id = it != audio_devices.end() ? std::distance(audio_devices.begin(), it) : 0;
-        if (ImGui::Combo(_LC("GameSettings", "Audio device"), &device_id, devices))
-        {
-            App::audio_device_name->SetStr(audio_devices[device_id]);
-        }
+    DrawGCheckbox(App::sim_no_self_collisions, _LC("GameSettings", "No intra truck collisions"));
+    DrawGCheckbox(App::sim_no_collisions, _LC("GameSettings", "No inter truck collisions"));
+
+    DrawGCheckbox(App::io_discord_rpc, _LC("GameSettings", "Discord Rich Presence"));
+}
+
+void GameSettings::DrawAudioSettings()
+{
+#ifdef USE_OPENAL
+    ImGui::TextDisabled("%s", _LC("GameSettings", "Audio settings"));
+
+    static const ALCchar *devices = alcGetString(NULL, ALC_ALL_DEVICES_SPECIFIER);
+    const ALCchar *device = devices, *next = devices + 1;
+    std::vector<std::string> audio_devices;
 
-        DrawGCheckbox(App::audio_enable_creak,     _LC("GameSettings", "Creak sound"));
-        DrawGCheckbox(App::audio_menu_music,       _LC("GameSettings", "Main menu music"));
-        DrawGFloatSlider(App::audio_master_volume, _LC("GameSettings", "Master volume"), 0, 1);
+    while (device && *device != '\0' && next && *next != '\0')
+    {
+            audio_devices.push_back(device);
+            size_t len = strlen(device);
+            device += (len + 1);
+            next += (len + 2);
     }
-#endif // USE_OPENAL
-    else if (m_tab == SettingsTab::GRAPHICS)
+
+    const auto it = std::find(audio_devices.begin(), audio_devices.end(), App::audio_device_name->GetStr());
+    int device_id = it != audio_devices.end() ? std::distance(audio_devices.begin(), it) : 0;
+    if (ImGui::Combo(_LC("GameSettings", "Audio device"), &device_id, devices))
     {
-        ImGui::TextDisabled("%s", _LC("GameSettings", "Video settings"));
+        App::audio_device_name->SetStr(audio_devices[device_id]);
+    }
 
-        DrawGCombo(App::gfx_flares_mode, _LC("GameSettings", "Light sources"),
-            "None (fastest)\0"
-            "No light sources\0"
-            "Only current vehicle, main lights\0"
-            "All vehicles, main lights\0"
-            "All vehicles, all lights\0\0");
+    DrawGCheckbox(App::audio_enable_creak,     _LC("GameSettings", "Creak sound"));
+    DrawGCheckbox(App::audio_menu_music,       _LC("GameSettings", "Main menu music"));
+    DrawGFloatSlider(App::audio_master_volume, _LC("GameSettings", "Master volume"), 0, 1);
+#endif // USE_OPENAL
+}
 
-        DrawGCombo(App::gfx_shadow_type, _LC("GameSettings", "Shadow type (requires restart)"),
-            "Disabled\0"
-            "PSSM\0\0");
+void GameSettings::DrawGraphicsSettings()
+{
+    ImGui::TextDisabled("%s", _LC("GameSettings", "Video settings"));
 
-        if (App::gfx_shadow_type->GetEnum<GfxShadowType>() != GfxShadowType::NONE)
-        {
-            DrawGCheckbox(App::gfx_reduce_shadows, _LC("GameSettings", "Shadow optimizations"));
-            if (App::gfx_shadow_type->GetEnum<GfxShadowType>() == GfxShadowType::PSSM)
-            {
-                DrawGIntSlider(App::gfx_shadow_quality, _LC("GameSettings", "Shadow quality"), 0, 3);
-            }
-        }
+    DrawGCombo(App::gfx_flares_mode, _LC("GameSettings", "Light sources"),
+        "None (fastest)\0"
+        "No light sources\0"
+        "Only current vehicle, main lights\0"
+        "All vehicles, main lights\0"
+        "All vehicles, all lights\0\0");
 
-        DrawGCombo(App::gfx_sky_mode, "Sky gfx",
-            "Sandstorm (fastest)\0"
-            "Caelum (best looking, slower)\0"
-            "SkyX (best looking, slower)\0\0");
+    DrawGCombo(App::gfx_shadow_type, _LC("GameSettings", "Shadow type (requires restart)"),
+        "Disabled\0"
+        "PSSM\0\0");
 
-        if (App::gfx_sky_mode->GetEnum<GfxSkyMode>() != GfxSkyMode::SKYX)
+    if (App::gfx_shadow_type->GetEnum<GfxShadowType>() != GfxShadowType::NONE)
+    {
+        DrawGCheckbox(App::gfx_reduce_shadows, _LC("GameSettings", "Shadow optimizations"));
+        if (App::gfx_shadow_type->GetEnum<GfxShadowType>() == GfxShadowType::PSSM)
         {
-          DrawGIntSlider(App::gfx_sight_range, _LC("GameSettings", "Sight range (meters)"), 100, 5000);
+            DrawGIntSlider(App::gfx_shadow_quality, _LC("GameSettings", "Shadow quality"), 0, 3);
         }
+    }
+
+    DrawGCombo(App::gfx_sky_mode, "Sky gfx",
+        "Sandstorm (fastest)\0"
+        "Caelum (best looking, slower)\0"
+        "SkyX (best looking, slower)\0\0");
+
+    if (App::gfx_sky_mode->GetEnum<GfxSkyMode>() != GfxSkyMode::SKYX)
+    {
+        DrawGIntSlider(App::gfx_sight_range, _LC("GameSettings", "Sight range (meters)"), 100, 5000);
+    }
 
-        DrawGCombo(App::gfx_texture_filter , _LC("GameSettings", "Texture filtering"),
-            "None\0"
-            "Bilinear\0"
-            "Trilinear\0"
-            "Anisotropic\0\0");
+    DrawGCombo(App::gfx_texture_filter , _LC("GameSettings", "Texture filtering"),
+        "None\0"
+        "Bilinear\0"
+        "Trilinear\0"
+        "Anisotropic\0\0");
 
-        if (App::gfx_texture_filter->GetEnum<GfxTexFilter>() == GfxTexFilter::ANISOTROPIC)
+    if (App::gfx_texture_filter->GetEnum<GfxTexFilter>() == GfxTexFilter::ANISOTROPIC)
+    {
+        int anisotropy = Ogre::Math::Clamp(App::gfx_anisotropy->GetInt(), 1, 16);
+        int  selection = std::log2(anisotropy);
+        if (ImGui::Combo(_LC("GameSettings", "Anisotropy"), &selection, "1\0""2\0""4\0""8\0""16\0\0"))
         {
-            int anisotropy = Ogre::Math::Clamp(App::gfx_anisotropy->GetInt(), 1, 16);
-            int  selection = std::log2(anisotropy);
-            if (ImGui::Combo(_LC("GameSettings", "Anisotropy"), &selection, "1\0""2\0""4\0""8\0""16\0\0"))
-            {
-                App::gfx_anisotropy->SetVal(std::pow(2, selection));
-            }
+            App::gfx_anisotropy->SetVal(std::pow(2, selection));
         }
+    }
 
-        DrawGCombo(App::gfx_vegetation_mode, _LC("GameSettings", "Vegetation density"),
-            "None\0"
-            "20%\0"
-            "50%\0"
-            "Full\0\0");
+    DrawGCombo(App::gfx_vegetation_mode, _LC("GameSettings", "Vegetation density"),
+        "None\0"
+        "20%\0"
+        "50%\0"
+        "Full\0\0");
 
-        DrawGCombo(App::gfx_water_mode, _LC("GameSettings", "Water gfx"),
-            "None\0"
-            "Basic (fastest)\0"
-            "Reflection\0"
-            "Reflection + refraction (speed optimized)\0"
-            "Reflection + refraction (quality optimized)\0"
-            "HydraX\0\0");
+    DrawGCombo(App::gfx_water_mode, _LC("GameSettings", "Water gfx"),
+        "None\0"
+        "Basic (fastest)\0"
+        "Reflection\0"
+        "Reflection + refraction (speed optimized)\0"
+        "Reflection + refraction (quality optimized)\0"
+        "HydraX\0\0");
 
-        DrawGIntSlider(App::gfx_fps_limit,       _LC("GameSettings", "FPS limit"), 0, 240);
+    DrawGIntSlider(App::gfx_fps_limit,       _LC("GameSettings", "FPS limit"), 0, 240);
 
-        DrawGIntCheck(App::gfx_particles_mode,   _LC("GameSettings", "Enable particle gfx"));
-        DrawGIntCheck(App::gfx_skidmarks_mode,   _LC("GameSettings", "Enable skidmarks"));
+    DrawGIntCheck(App::gfx_particles_mode,   _LC("GameSettings", "Enable particle gfx"));
+    DrawGIntCheck(App::gfx_skidmarks_mode,   _LC("GameSettings", "Enable skidmarks"));
 
-        DrawGCheckbox(App::gfx_envmap_enabled,   _LC("GameSettings", "Realtime reflections"));
-        if (App::gfx_envmap_enabled->GetBool())
-        {
-            ImGui::PushItemWidth(125.f); // Width includes [+/-] buttons
-            DrawGIntSlider(App::gfx_envmap_rate, _LC("GameSettings", "Realtime refl. update rate"), 0, 6);
-            ImGui::PopItemWidth();
-        }
+    DrawGCheckbox(App::gfx_envmap_enabled,   _LC("GameSettings", "Realtime reflections"));
+    if (App::gfx_envmap_enabled->GetBool())
+    {
+        ImGui::PushItemWidth(125.f); // Width includes [+/-] buttons
+        DrawGIntSlider(App::gfx_envmap_rate, _LC("GameSettings", "Realtime refl. update rate"), 0, 6);
+        ImGui::PopItemWidth();
+    }
 
-        DrawGCheckbox(App::gfx_enable_videocams, _LC("GameSettings", "Render video cameras"));
-        DrawGCheckbox(App::gfx_surveymap_icons,  _LC("GameSettings", "Overview map icons"));
-        if (App::gfx_surveymap_icons->GetBool())
-        {
-            DrawGCheckbox(App::gfx_declutter_map,  _LC("GameSettings", "Declutter overview map"));
-        }
-        DrawGCheckbox(App::gfx_water_waves,      _LC("GameSettings", "Waves on water"));
-        DrawGCheckbox(App::gfx_classic_shaders,      _LC("GameSettings", "Classic material shaders (experimental)"));
+    DrawGCheckbox(App::gfx_enable_videocams, _LC("GameSettings", "Render video cameras"));
+    DrawGCheckbox(App::gfx_surveymap_icons,  _LC("GameSettings", "Overview map icons"));
+    if (App::gfx_surveymap_icons->GetBool())
+    {
+        DrawGCheckbox(App::gfx_declutter_map,  _LC("GameSettings", "Declutter overview map"));
+    }
+    DrawGCheckbox(App::gfx_water_waves,      _LC("GameSettings", "Waves on water"));
+    DrawGCheckbox(App::gfx_classic_shaders,      _LC("GameSettings", "Classic material shaders (experimental)"));
 
-        DrawGCombo(App::gfx_extcam_mode, "Exterior camera mode",
-            "None\0"
-            "Static\0"
-            "Pitching\0\0");
+    DrawGCombo(App::gfx_extcam_mode, "Exterior camera mode",
+        "None\0"
+        "Static\0"
+        "Pitching\0\0");
 
-        DrawGIntSlider(App::gfx_camera_height, _LC("GameSettings", "Static camera height (meters)"), 1, 50);
-        DrawGIntSlider(App::gfx_fov_external_default, _LC("GameSettings", "Exterior field of view"), 10, 120);
-        DrawGIntSlider(App::gfx_fov_internal_default, _LC("GameSettings", "Interior field of view"), 10, 120);
-    }
-    else if (m_tab == SettingsTab::DIAG)
+    DrawGIntSlider(App::gfx_camera_height, _LC("GameSettings", "Static camera height (meters)"), 1, 50);
+    DrawGIntSlider(App::gfx_fov_external_default, _LC("GameSettings", "Exterior field of view"), 10, 120);
+    DrawGIntSlider(App::gfx_fov_internal_default, _LC("GameSettings", "Interior field of view"), 10, 120);
+}
+
+void GameSettings::DrawDiagSettings()
+{
+    ImGui::TextDisabled("%s", _LC("GameSettings", "Diagnostic options"));
+    ImGui::TextColored(ImVec4(0.89f,0.15f,0.21f,1.0f), "%s", _LC("GameSettings", "These settings are for advanced users only, you should only change these if you know what you're doing"));
+
+    DrawGTextEdit(App::diag_preset_terrain,      _LC("GameSettings", "Preselected terrain"),         m_buf_diag_preset_terrain);
+    DrawGTextEdit(App::diag_preset_vehicle,      _LC("GameSettings", "Preselected vehicle"),         m_buf_diag_preset_vehicle);
+    DrawGTextEdit(App::diag_preset_veh_config,   _LC("GameSettings", "Presel. veh. config"),         m_buf_diag_preset_veh_config);
+    DrawGCheckbox(App::diag_preset_veh_enter,    _LC("GameSettings", "Enter preselected vehicle"));
+    DrawGCheckbox(App::diag_auto_spawner_report, _LC("GameSettings", "Auto actor spawner report"));
+    DrawGCheckbox(App::diag_rig_log_node_import, _LC("GameSettings", "Log node import (spawn)"));
+    DrawGCheckbox(App::diag_rig_log_node_stats,  _LC("GameSettings", "Log node stats (spawn)"));
+    DrawGCheckbox(App::diag_camera,              _LC("GameSettings", "Debug camera (rails)"));
+    DrawGCheckbox(App::diag_collisions,          _LC("GameSettings", "Debug collisions"));
+    DrawGCheckbox(App::diag_truck_mass,          _LC("GameSettings", "Debug actor mass"));
+    DrawGCheckbox(App::diag_envmap,              _LC("GameSettings", "Debug realtime reflections"));
+    DrawGCheckbox(App::diag_videocameras,        _LC("GameSettings", "Debug videocameras"));
+    DrawGCheckbox(App::diag_warning_texture,     _LC("GameSettings", "Debug textures"));
+    DrawGCheckbox(App::diag_hide_broken_beams,   _LC("GameSettings", "Hide broken beams"));
+    DrawGCheckbox(App::diag_hide_wheel_info,     _LC("GameSettings", "Hide wheel info"));
+    DrawGCheckbox(App::diag_hide_wheels,         _LC("GameSettings", "Hide wheels"));
+    DrawGCheckbox(App::diag_hide_nodes,          _LC("GameSettings", "Hide nodes"));
+    DrawGCheckbox(App::diag_log_console_echo,    _LC("GameSettings", "Echo log to console"));
+    DrawGCheckbox(App::diag_log_beam_break,      _LC("GameSettings", "Log beam breaking"));
+    DrawGCheckbox(App::diag_log_beam_deform,     _LC("GameSettings", "Log beam deforming"));
+    DrawGCheckbox(App::diag_log_beam_trigger,    _LC("GameSettings", "Log beam triggers"));
+    if (ImGui::Button(_LC("GameSettings", "Rebuild cache")))
     {
-        ImGui::TextDisabled("%s", _LC("GameSettings", "Diagnostic options"));
-        ImGui::TextColored(ImVec4(0.89f,0.15f,0.21f,1.0f), "%s", _LC("GameSettings", "These settings are for advanced users only, you should only change these if you know what you're doing"));
-
-        DrawGTextEdit(App::diag_preset_terrain,      _LC("GameSettings", "Preselected terrain"),         m_buf_diag_preset_terrain);
-        DrawGTextEdit(App::diag_preset_vehicle,      _LC("GameSettings", "Preselected vehicle"),         m_buf_diag_preset_vehicle);
-        DrawGTextEdit(App::diag_preset_veh_config,   _LC("GameSettings", "Presel. veh. config"),         m_buf_diag_preset_veh_config);
-        DrawGCheckbox(App::diag_preset_veh_enter,    _LC("GameSettings", "Enter preselected vehicle"));
-        DrawGCheckbox(App::diag_auto_spawner_report, _LC("GameSettings", "Auto actor spawner report"));
-        DrawGCheckbox(App::diag_rig_log_node_import, _LC("GameSettings", "Log node import (spawn)"));
-        DrawGCheckbox(App::diag_rig_log_node_stats,  _LC("GameSettings", "Log node stats (spawn)"));
-        DrawGCheckbox(App::diag_camera,              _LC("GameSettings", "Debug camera (rails)"));
-        DrawGCheckbox(App::diag_collisions,          _LC("GameSettings", "Debug collisions"));
-        DrawGCheckbox(App::diag_truck_mass,          _LC("GameSettings", "Debug actor mass"));
-        DrawGCheckbox(App::diag_envmap,              _LC("GameSettings", "Debug realtime reflections"));
-        DrawGCheckbox(App::diag_videocameras,        _LC("GameSettings", "Debug videocameras"));
-        DrawGCheckbox(App::diag_warning_texture,     _LC("GameSettings", "Debug textures"));
-        DrawGCheckbox(App::diag_hide_broken_beams,   _LC("GameSettings", "Hide broken beams"));
-        DrawGCheckbox(App::diag_hide_wheel_info,     _LC("GameSettings", "Hide wheel info"));
-        DrawGCheckbox(App::diag_hide_wheels,         _LC("GameSettings", "Hide wheels"));
-        DrawGCheckbox(App::diag_hide_nodes,          _LC("GameSettings", "Hide nodes"));
-        DrawGCheckbox(App::diag_log_console_echo,    _LC("GameSettings", "Echo log to console"));
-        DrawGCheckbox(App::diag_log_beam_break,      _LC("GameSettings", "Log beam breaking"));
-        DrawGCheckbox(App::diag_log_beam_deform,     _LC("GameSettings", "Log beam deforming"));
-        DrawGCheckbox(App::diag_log_beam_trigger,    _LC("GameSettings", "Log beam triggers"));
-        if (ImGui::Button(_LC("GameSettings", "Rebuild cache")))
-        {
-            App::GetGuiManager()->SetVisible_GameSettings(false);
-            App::GetGameContext()->PushMessage(Message(MSG_APP_MODCACHE_PURGE_REQUESTED));
-            App::GetGameContext()->PushMessage(Message(MSG_GUI_OPEN_MENU_REQUESTED));
-        }
+        App::GetGuiManager()->SetVisible_GameSettings(false);
+        App::GetGameContext()->PushMessage(Message(MSG_APP_MODCACHE_PURGE_REQUESTED));
+        App::GetGameContext()->PushMessage(Message(MSG_GUI_OPEN_MENU_REQUESTED));
     }
-    else if (m_tab == SettingsTab::CONTROL)
-    {
-        ImGui::TextDisabled("%s", _LC("GameSettings", "Controller options"));
+}
 
-        DrawGCombo(App::io_input_grab_mode, _LC("GameSettings", "Input grab mode"),
-            "None\0"
-            "All\0"
-            "Dynamic\0\0");
+void GameSettings::DrawControlSettings()
+{
+    ImGui::TextDisabled("%s", _LC("GameSettings", "Controller options"));
 
-        DrawGFloatSlider(App::io_analog_smoothing,   _LC("GameSettings", "Analog Input Smoothing"),   0.5f, 2.0f);
-        DrawGFloatSlider(App::io_analog_sensitivity, _LC("GameSettings", "Analog Input Sensitivity"), 0.5f, 2.0f);
-        DrawGFloatSlider(App::io_blink_lock_range,   _LC("GameSettings", "Blinker Lock Range"),       0.1f, 1.0f);
+    DrawGCombo(App::io_input_grab_mode, _LC("GameSettings", "Input grab mode"),
+        "None\0"
+        "All\0"
+        "Dynamic\0\0");
 
-        DrawGCheckbox(App::io_arcade_controls, _LC("GameSettings", "Use arcade controls"));
+    DrawGFloatSlider(App::io_analog_smoothing,   _LC("GameSettings", "Analog Input Smoothing"),   0.5f, 2.0f);
+    DrawGFloatSlider(App::io_analog_sensitivity, _LC("GameSettings", "Analog Input Sensitivity"), 0.5f, 2.0f);
+    DrawGFloatSlider(App::io_blink_lock_range,   _LC("GameSettings", "Blinker Lock Range"),       0.1f, 1.0f);
 
-        DrawGCheckbox(App::io_ffb_enabled, _LC("GameSettings", "Enable ForceFeedback"));
-        if (App::io_ffb_enabled->GetBool())
-        {
-            ImGui::PushItemWidth(125.f);
-            DrawGFloatBox(App::io_ffb_camera_gain, _LC("GameSettings", "FFB camera gain"));
-            DrawGFloatBox(App::io_ffb_center_gain, _LC("GameSettings", "FFB center gain"));
-            DrawGFloatBox(App::io_ffb_master_gain, _LC("GameSettings", "FFB master gain"));
-            DrawGFloatBox(App::io_ffb_stress_gain, _LC("GameSettings", "FFB stress gain"));
-            ImGui::PopItemWidth();
-        }
+    DrawGCheckbox(App::io_arcade_controls, _LC("GameSettings", "Use arcade controls"));
 
-        DrawGIntCheck(App::io_outgauge_mode, _LC("GameSettings", "Enable OutGauge protocol"));
-        if (App::io_outgauge_mode->GetBool())
-        {
-            DrawGTextEdit(App::io_outgauge_ip, _LC("GameSettings", "OutGauge IP"), m_buf_io_outgauge_ip);
-            ImGui::PushItemWidth(125.f);
-            DrawGIntBox(App::io_outgauge_port,    _LC("GameSettings", "OutGauge port"));
-            DrawGIntBox(App::io_outgauge_id,      _LC("GameSettings", "OutGauge ID"));
-            DrawGFloatBox(App::io_outgauge_delay, _LC("GameSettings", "OutGauge delay"));
-            ImGui::PopItemWidth();
-        }
+    DrawGCheckbox(App::io_ffb_enabled, _LC("GameSettings", "Enable ForceFeedback"));
+    if (App::io_ffb_enabled->GetBool())
+    {
+        ImGui::PushItemWidth(125.f);
+        DrawGFloatBox(App::io_ffb_camera_gain, _LC("GameSettings", "FFB camera gain"));
+        DrawGFloatBox(App::io_ffb_center_gain, _LC("GameSettings", "FFB center gain"));
+        DrawGFloatBox(App::io_ffb_master_gain, _LC("GameSettings", "FFB master gain"));
+        DrawGFloatBox(App::io_ffb_stress_gain, _LC("GameSettings", "FFB stress gain"));
+        ImGui::PopItemWidth();
     }
 
-    App::GetGuiManager()->RequestGuiCaptureKeyboard(ImGui::IsWindowHovered());
-    ImGui::End();
-    if (!keep_open)
+    DrawGIntCheck(App::io_outgauge_mode, _LC("GameSettings", "Enable OutGauge protocol"));
+    if (App::io_outgauge_mode->GetBool())
     {
-        this->SetVisible(false);
+        DrawGTextEdit(App::io_outgauge_ip, _LC("GameSettings", "OutGauge IP"), m_buf_io_outgauge_ip);
+        ImGui::PushItemWidth(125.f);
+        DrawGIntBox(App::io_outgauge_port,    _LC("GameSettings", "OutGauge port"));
+        DrawGIntBox(App::io_outgauge_id,      _LC("GameSettings", "OutGauge ID"));
+        DrawGFloatBox(App::io_outgauge_delay, _LC("GameSettings", "OutGauge delay"));
+        ImGui::PopItemWidth();
     }
 }
 
 void GameSettings::SetVisible(bool v)
 {
     m_is_visible = v;
-    if (v)
-    {
-        m_tab = SettingsTab::RENDER_SYSTEM;
-    }
-    else if (App::app_state->GetEnum<AppState>() == RoR::AppState::MAIN_MENU)
+    if (!v && App::app_state->GetEnum<AppState>() == RoR::AppState::MAIN_MENU)
     {
         App::GetGuiManager()->SetVisible_GameMainMenu(true);
     }
diff --git a/source/main/gui/panels/GUI_GameSettings.h b/source/main/gui/panels/GUI_GameSettings.h
index 4cd3c9d9ee..7d72ccb242 100644
--- a/source/main/gui/panels/GUI_GameSettings.h
+++ b/source/main/gui/panels/GUI_GameSettings.h
@@ -28,18 +28,21 @@ namespace GUI {
 class GameSettings
 {
 public:
-    enum SettingsTab { RENDER_SYSTEM, GENERAL, GRAPHICS, AUDIO, CONTROL, DIAG };
-
-    GameSettings(): m_is_visible(false), m_tab(SettingsTab::RENDER_SYSTEM) {}
-
     void Draw();
 
     bool IsVisible() const { return m_is_visible; }
     void SetVisible(bool v);
 
 private:
-    bool m_is_visible;
-    SettingsTab m_tab;
+    void DrawRenderSystemSettings();
+    void DrawGeneralSettings();
+    void DrawGameplaySettings();
+    void DrawGraphicsSettings();
+    void DrawAudioSettings();
+    void DrawControlSettings();
+    void DrawDiagSettings();
+
+    bool m_is_visible = false;
 
     Str<1000> m_buf_diag_preset_terrain;
     Str<1000> m_buf_diag_preset_vehicle;