diff --git a/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs b/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
index 7a3bf74428..a56d2892a4 100644
--- a/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
+++ b/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
@@ -85,8 +85,8 @@ namespace osu.Game.Screens.Multi.Lounge
             content.Padding = new MarginPadding
             {
                 Top = Filter.DrawHeight,
-                Left = SearchableListOverlay.WIDTH_PADDING - DrawableRoom.SELECTION_BORDER_WIDTH + HORIZONTAL_OVERFLOW_PADDING,
-                Right = SearchableListOverlay.WIDTH_PADDING + HORIZONTAL_OVERFLOW_PADDING,
+                Left = SearchableListOverlay.WIDTH_PADDING - DrawableRoom.SELECTION_BORDER_WIDTH + OsuScreen.HORIZONTAL_OVERFLOW_PADDING,
+                Right = SearchableListOverlay.WIDTH_PADDING + OsuScreen.HORIZONTAL_OVERFLOW_PADDING,
             };
         }
 
diff --git a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
index 17edfc8519..0a4e0daac7 100644
--- a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
+++ b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
@@ -72,7 +72,7 @@ namespace osu.Game.Screens.Multi.Match
                                         {
                                             Padding = new MarginPadding
                                             {
-                                                Left = 10 + HORIZONTAL_OVERFLOW_PADDING,
+                                                Left = 10 + OsuScreen.HORIZONTAL_OVERFLOW_PADDING,
                                                 Right = 10,
                                                 Vertical = 10,
                                             },
@@ -84,7 +84,7 @@ namespace osu.Game.Screens.Multi.Match
                                             Padding = new MarginPadding
                                             {
                                                 Left = 10,
-                                                Right = 10 + HORIZONTAL_OVERFLOW_PADDING,
+                                                Right = 10 + OsuScreen.HORIZONTAL_OVERFLOW_PADDING,
                                                 Vertical = 10,
                                             },
                                             RelativeSizeAxes = Axes.Both,
@@ -113,10 +113,10 @@ namespace osu.Game.Screens.Multi.Match
                 },
             };
 
-            header.OnRequestSelectBeatmap = () => Push(new MatchSongSelect
+            header.OnRequestSelectBeatmap = () => this.Push(new MatchSongSelect
             {
                 Selected = addPlaylistItem,
-                Padding = new MarginPadding { Horizontal = HORIZONTAL_OVERFLOW_PADDING }
+                Padding = new MarginPadding { Horizontal = OsuScreen.HORIZONTAL_OVERFLOW_PADDING }
             });
 
             header.Tabs.Current.ValueChanged += t =>
diff --git a/osu.Game/Screens/OsuScreen.cs b/osu.Game/Screens/OsuScreen.cs
index aafa3f4b37..8a5a3a82b0 100644
--- a/osu.Game/Screens/OsuScreen.cs
+++ b/osu.Game/Screens/OsuScreen.cs
@@ -85,6 +85,12 @@ namespace osu.Game.Screens
             sampleExit = audio.Sample.Get(@"UI/screen-back");
         }
 
+        public MarginPadding Padding
+        {
+            get => base.Padding;
+            set => base.Padding = value;
+        }
+
         public virtual bool OnPressed(GlobalAction action)
         {
             if (!this.IsCurrentScreen()) return false;