diff --git a/osu.Game/Overlays/FirstRunSetup/FirstRunSetupScreen.cs b/osu.Game/Overlays/FirstRunSetup/FirstRunSetupScreen.cs
index 2d025d46ef..b2284a999d 100644
--- a/osu.Game/Overlays/FirstRunSetup/FirstRunSetupScreen.cs
+++ b/osu.Game/Overlays/FirstRunSetup/FirstRunSetupScreen.cs
@@ -2,7 +2,10 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Framework.Screens;
+using osu.Game.Graphics.Containers;
+using osuTK;
 
 namespace osu.Game.Overlays.FirstRunSetup
 {
@@ -10,6 +13,26 @@ namespace osu.Game.Overlays.FirstRunSetup
     {
         private const float offset = 100;
 
+        protected FillFlowContainer Content { get; private set; }
+
+        protected FirstRunSetupScreen()
+        {
+            InternalChildren = new Drawable[]
+            {
+                new OsuScrollContainer(Direction.Vertical)
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Child = Content = new FillFlowContainer
+                    {
+                        Spacing = new Vector2(20),
+                        RelativeSizeAxes = Axes.X,
+                        AutoSizeAxes = Axes.Y,
+                        Direction = FillDirection.Vertical,
+                    },
+                }
+            };
+        }
+
         public override void OnEntering(IScreen last)
         {
             base.OnEntering(last);
diff --git a/osu.Game/Overlays/FirstRunSetup/ScreenWelcome.cs b/osu.Game/Overlays/FirstRunSetup/ScreenWelcome.cs
index 9f80c80a02..39da180f40 100644
--- a/osu.Game/Overlays/FirstRunSetup/ScreenWelcome.cs
+++ b/osu.Game/Overlays/FirstRunSetup/ScreenWelcome.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Localisation;
@@ -13,21 +12,13 @@ namespace osu.Game.Overlays.FirstRunSetup
     {
         public ScreenWelcome()
         {
-            InternalChildren = new Drawable[]
+            Content.Children = new Drawable[]
             {
-                new FillFlowContainer
+                new OsuTextFlowContainer(cp => cp.Font = OsuFont.Default.With(size: 20))
                 {
-                    RelativeSizeAxes = Axes.Both,
-                    Direction = FillDirection.Vertical,
-                    Children = new Drawable[]
-                    {
-                        new OsuTextFlowContainer(cp => cp.Font = OsuFont.Default.With(size: 20))
-                        {
-                            Text = FirstRunSetupOverlayStrings.WelcomeDescription,
-                            RelativeSizeAxes = Axes.X,
-                            AutoSizeAxes = Axes.Y
-                        },
-                    }
+                    Text = FirstRunSetupOverlayStrings.WelcomeDescription,
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y
                 },
             };
         }