diff --git a/osu.Game/Overlays/Options/OptionsSection.cs b/osu.Game/Overlays/Options/OptionsSection.cs
index 7c598a92f2..ac2e1182a9 100644
--- a/osu.Game/Overlays/Options/OptionsSection.cs
+++ b/osu.Game/Overlays/Options/OptionsSection.cs
@@ -61,7 +61,7 @@ namespace osu.Game.Overlays.Options
                         {
                             Margin = new MarginPadding { Top = headerSize + headerMargin },
                             Direction = FlowDirection.VerticalOnly,
-                            Spacing = new Vector2(0, 50),
+                            Spacing = new Vector2(0, 30),
                             AutoSizeAxes = Axes.Y,
                             RelativeSizeAxes = Axes.X,
                         },
diff --git a/osu.Game/Overlays/Options/OptionsSubsection.cs b/osu.Game/Overlays/Options/OptionsSubsection.cs
index 8199011cc2..42e4b50558 100644
--- a/osu.Game/Overlays/Options/OptionsSubsection.cs
+++ b/osu.Game/Overlays/Options/OptionsSubsection.cs
@@ -4,12 +4,13 @@
 using OpenTK;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics.Sprites;
 
 namespace osu.Game.Overlays.Options
 {
-    public abstract class OptionsSubsection : Container
+    public abstract class OptionsSubsection : FlowContainer
     {
         private Container<Drawable> content;
         protected override Container<Drawable> Content => content;
@@ -20,23 +21,21 @@ namespace osu.Game.Overlays.Options
         {
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
+            Direction = FlowDirection.VerticalOnly;
             AddInternal(new Drawable[]
             {
+                new OsuSpriteText
+                {
+                    Text = Header.ToUpper(),
+                    Margin = new MarginPadding { Bottom = 10 },
+                    Font = @"Exo2.0-Black",
+                },
                 content = new FlowContainer
                 {
                     Direction = FlowDirection.VerticalOnly,
                     RelativeSizeAxes = Axes.X,
                     AutoSizeAxes = Axes.Y,
                     Spacing = new Vector2(0, 5),
-                    Children = new[]
-                    {
-                        new OsuSpriteText
-                        {
-                            TextSize = 17,
-                            Text = Header.ToUpper(),
-                            Font = @"Exo2.0-Black",
-                        }
-                    }
                 },
             });
         }