diff --git a/osu.Game/Screens/Edit/Setup/SetupScreen.cs b/osu.Game/Screens/Edit/Setup/SetupScreen.cs
index 72bf3ad67e..746cf38867 100644
--- a/osu.Game/Screens/Edit/Setup/SetupScreen.cs
+++ b/osu.Game/Screens/Edit/Setup/SetupScreen.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Screens.Edit.Setup
         {
             AddRange(new Drawable[]
             {
-                sections = new SectionsContainer<SetupSection>
+                sections = new SetupScreenSectionsContainer
                 {
                     FixedHeader = header,
                     RelativeSizeAxes = Axes.Both,
@@ -40,5 +40,19 @@ namespace osu.Game.Screens.Edit.Setup
                 },
             });
         }
+
+        private class SetupScreenSectionsContainer : SectionsContainer<SetupSection>
+        {
+            protected override UserTrackingScrollContainer CreateScrollContainer()
+            {
+                var scrollContainer = base.CreateScrollContainer();
+
+                // Workaround for masking issues (see https://github.com/ppy/osu-framework/issues/1675#issuecomment-910023157)
+                // Note that this actually causes the full scroll range to be reduced by 2px at the bottom, but it's not really noticeable.
+                scrollContainer.Margin = new MarginPadding { Top = 2 };
+
+                return scrollContainer;
+            }
+        }
     }
 }