diff --git a/osu.Game.Tests/Visual/Menus/TestSceneSideOverlays.cs b/osu.Game.Tests/Visual/Menus/TestSceneSideOverlays.cs
index 598998586d..21db7e2802 100644
--- a/osu.Game.Tests/Visual/Menus/TestSceneSideOverlays.cs
+++ b/osu.Game.Tests/Visual/Menus/TestSceneSideOverlays.cs
@@ -1,12 +1,9 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System.Linq;
 using NUnit.Framework;
-using osu.Framework.Graphics.Containers;
 using osu.Framework.Testing;
 using osu.Game.Overlays;
-using osu.Game.Overlays.Settings.Sections.Input;
 using osu.Game.Tests.Visual.Navigation;
 
 namespace osu.Game.Tests.Visual.Menus
@@ -32,24 +29,6 @@ namespace osu.Game.Tests.Visual.Menus
             AddUntilStep("screen offset removed", () => Game.ScreenOffsetContainer.X == 0f);
         }
 
-        [Test]
-        public void TestScreenOffsettingAccountsForKeyBindingPanel()
-        {
-            AddStep("open settings", () => Game.Settings.Show());
-            AddStep("open key binding panel", () => Game.Settings.ChildrenOfType<KeyBindingPanel>().Single().Show());
-            AddUntilStep("right screen offset applied", () => Game.ScreenOffsetContainer.X == SettingsPanel.WIDTH * OsuGame.SCREEN_OFFSET_RATIO);
-
-            AddStep("hide key binding", () => Game.Settings.ChildrenOfType<KeyBindingPanel>().Single().Show());
-            AddUntilStep("right screen offset still applied", () => Game.ScreenOffsetContainer.X == SettingsPanel.WIDTH * OsuGame.SCREEN_OFFSET_RATIO);
-
-            AddStep("open key binding", () => Game.Settings.Show());
-            AddUntilStep("right screen offset still applied", () => Game.ScreenOffsetContainer.X == SettingsPanel.WIDTH * OsuGame.SCREEN_OFFSET_RATIO);
-
-            AddStep("hide settings", () => Game.Settings.Hide());
-            AddAssert("key binding panel still open", () => Game.Settings.ChildrenOfType<KeyBindingPanel>().Single().State.Value == Visibility.Visible);
-            AddUntilStep("screen offset removed", () => Game.ScreenOffsetContainer.X == 0f);
-        }
-
         [Test]
         public void TestScreenOffsettingOnNotificationOverlay()
         {
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 6fb884f80a..1539d984ae 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -1013,9 +1013,10 @@ namespace osu.Game
             ScreenOffsetContainer.Padding = new MarginPadding { Top = ToolbarOffset };
             overlayContent.Padding = new MarginPadding { Top = ToolbarOffset };
 
-            var settingsOffset = Settings.HorizontalScreenOffset * SCREEN_OFFSET_RATIO;
-            var notificationsOffset = Notifications.HorizontalScreenOffset * SCREEN_OFFSET_RATIO;
-            ScreenOffsetContainer.X = settingsOffset + notificationsOffset;
+            ScreenOffsetContainer.X = 0f;
+
+            if (Settings.IsLoaded) ScreenOffsetContainer.X += (ToLocalSpace(Settings.ScreenSpaceDrawQuad.TopRight).X) * SCREEN_OFFSET_RATIO;
+            if (Notifications.IsLoaded) ScreenOffsetContainer.X += (ToLocalSpace(Notifications.ScreenSpaceDrawQuad.TopLeft).X - DrawWidth) * SCREEN_OFFSET_RATIO;
 
             MenuCursorContainer.CanShowCursor = (ScreenStack.CurrentScreen as IOsuScreen)?.CursorVisible ?? false;
         }