diff --git a/osu.Game/Screens/Edit/Setup/BackgroundChooser.cs b/osu.Game/Screens/Edit/Setup/BackgroundChooser.cs
index 7bdd962ec8..9137eca334 100644
--- a/osu.Game/Screens/Edit/Setup/BackgroundChooser.cs
+++ b/osu.Game/Screens/Edit/Setup/BackgroundChooser.cs
@@ -44,8 +44,7 @@ namespace osu.Game.Screens.Edit.Setup
             InternalChild = content = new Container
             {
                 RelativeSizeAxes = Axes.Both,
-                Masking = true,
-                CornerRadius = 10,
+                Masking = true
             };
         }
 
@@ -133,7 +132,7 @@ namespace osu.Game.Screens.Edit.Setup
                             Text = "Drag image here to set beatmap background!",
                             Anchor = Anchor.Centre,
                             Origin = Anchor.Centre,
-                            AutoSizeAxes = Axes.X,
+                            AutoSizeAxes = Axes.Both
                         }
                     };
                 }
diff --git a/osu.Game/Screens/Edit/Setup/ResourcesSection.cs b/osu.Game/Screens/Edit/Setup/ResourcesSection.cs
index 523ded7aec..3058f99fce 100644
--- a/osu.Game/Screens/Edit/Setup/ResourcesSection.cs
+++ b/osu.Game/Screens/Edit/Setup/ResourcesSection.cs
@@ -54,11 +54,6 @@ namespace osu.Game.Screens.Edit.Setup
 
             Children = new Drawable[]
             {
-                new BackgroundChooser
-                {
-                    RelativeSizeAxes = Axes.X,
-                    Height = 250,
-                },
                 audioTrackTextBox = new FileChooserLabelledTextBox
                 {
                     Label = "Audio Track",
diff --git a/osu.Game/Screens/Edit/Setup/SetupScreenHeader.cs b/osu.Game/Screens/Edit/Setup/SetupScreenHeader.cs
index 1be833cb9d..b0533e6f00 100644
--- a/osu.Game/Screens/Edit/Setup/SetupScreenHeader.cs
+++ b/osu.Game/Screens/Edit/Setup/SetupScreenHeader.cs
@@ -25,12 +25,24 @@ namespace osu.Game.Screens.Edit.Setup
         {
             RelativeSizeAxes = Axes.X,
             AutoSizeAxes = Axes.Y,
-            Children = new Drawable[]
+            // reverse flow is used to ensure that the tab control's expandable bars extend over the background chooser.
+            Child = new ReverseChildIDFillFlowContainer<Drawable>
             {
-                tabControl = new SetupScreenTabControl
+                RelativeSizeAxes = Axes.X,
+                AutoSizeAxes = Axes.Y,
+                Direction = FillDirection.Vertical,
+                Children = new Drawable[]
                 {
-                    RelativeSizeAxes = Axes.X,
-                    Height = 30
+                    tabControl = new SetupScreenTabControl
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        Height = 30
+                    },
+                    new BackgroundChooser
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        Height = 120
+                    }
                 }
             }
         };