diff --git a/osu.Game.Tests/Visual/Editing/TestSceneDesignSection.cs b/osu.Game.Tests/Visual/Editing/TestSceneDesignSection.cs
new file mode 100644
index 0000000000..d84ffa1052
--- /dev/null
+++ b/osu.Game.Tests/Visual/Editing/TestSceneDesignSection.cs
@@ -0,0 +1,97 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using System.Globalization;
+using System.Linq;
+using NUnit.Framework;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.UserInterface;
+using osu.Framework.Testing;
+using osu.Game.Beatmaps;
+using osu.Game.Graphics.UserInterfaceV2;
+using osu.Game.Screens.Edit;
+using osu.Game.Screens.Edit.Setup;
+using osuTK.Input;
+
+namespace osu.Game.Tests.Visual.Editing
+{
+    public class TestSceneDesignSection : OsuManualInputManagerTestScene
+    {
+        private TestDesignSection designSection;
+        private EditorBeatmap editorBeatmap { get; set; }
+
+        [SetUpSteps]
+        public void SetUp()
+        {
+            AddStep("create blank beatmap", () => editorBeatmap = new EditorBeatmap(new Beatmap()));
+            AddStep("create section", () => Child = new DependencyProvidingContainer
+            {
+                RelativeSizeAxes = Axes.Both,
+                CachedDependencies = new (Type, object)[]
+                {
+                    (typeof(EditorBeatmap), editorBeatmap)
+                },
+                Child = designSection = new TestDesignSection()
+            });
+        }
+
+        [Test]
+        public void TestCountdownOff()
+        {
+            AddStep("turn countdown off", () => designSection.EnableCountdown.Current.Value = false);
+
+            AddAssert("beatmap has correct type", () => editorBeatmap.BeatmapInfo.Countdown == CountdownType.None);
+            AddUntilStep("other controls hidden", () => !designSection.CountdownSpeed.IsPresent && !designSection.CountdownOffset.IsPresent);
+        }
+
+        [Test]
+        public void TestCountdownOn()
+        {
+            AddStep("turn countdown on", () => designSection.EnableCountdown.Current.Value = true);
+
+            AddAssert("beatmap has correct type", () => editorBeatmap.BeatmapInfo.Countdown == CountdownType.Normal);
+            AddUntilStep("other controls shown", () => designSection.CountdownSpeed.IsPresent && designSection.CountdownOffset.IsPresent);
+
+            AddStep("change countdown speed", () => designSection.CountdownSpeed.Current.Value = CountdownType.DoubleSpeed);
+
+            AddAssert("beatmap has correct type", () => editorBeatmap.BeatmapInfo.Countdown == CountdownType.DoubleSpeed);
+            AddUntilStep("other controls still shown", () => designSection.CountdownSpeed.IsPresent && designSection.CountdownOffset.IsPresent);
+        }
+
+        [Test]
+        public void TestCountdownOffset()
+        {
+            AddStep("turn countdown on", () => designSection.EnableCountdown.Current.Value = true);
+
+            AddAssert("beatmap has correct type", () => editorBeatmap.BeatmapInfo.Countdown == CountdownType.Normal);
+
+            checkOffsetAfter("1", 1);
+            checkOffsetAfter(string.Empty, 0);
+            checkOffsetAfter("123", 123);
+            checkOffsetAfter("0", 0);
+        }
+
+        private void checkOffsetAfter(string userInput, int expectedFinalValue)
+        {
+            AddStep("click text box", () =>
+            {
+                var textBox = designSection.CountdownOffset.ChildrenOfType<TextBox>().Single();
+                InputManager.MoveMouseTo(textBox);
+                InputManager.Click(MouseButton.Left);
+            });
+            AddStep("set offset text", () => designSection.CountdownOffset.Current.Value = userInput);
+            AddStep("commit text", () => InputManager.Key(Key.Enter));
+
+            AddAssert($"displayed value is {expectedFinalValue}", () => designSection.CountdownOffset.Current.Value == expectedFinalValue.ToString(CultureInfo.InvariantCulture));
+            AddAssert($"beatmap value is {expectedFinalValue}", () => editorBeatmap.BeatmapInfo.CountdownOffset == expectedFinalValue);
+        }
+
+        private class TestDesignSection : DesignSection
+        {
+            public new LabelledSwitchButton EnableCountdown => base.EnableCountdown;
+            public new LabelledEnumDropdown<CountdownType> CountdownSpeed => base.CountdownSpeed;
+            public new LabelledNumberBox CountdownOffset => base.CountdownOffset;
+        }
+    }
+}
diff --git a/osu.Game/Screens/Edit/Setup/DesignSection.cs b/osu.Game/Screens/Edit/Setup/DesignSection.cs
index 633196ff2e..d030c2a894 100644
--- a/osu.Game/Screens/Edit/Setup/DesignSection.cs
+++ b/osu.Game/Screens/Edit/Setup/DesignSection.cs
@@ -18,15 +18,16 @@ namespace osu.Game.Screens.Edit.Setup
     {
         private const float fade_duration = 250;
 
-        private LabelledSwitchButton enableCountdown;
-        private FillFlowContainer countdownSettings;
-        private LabelledEnumDropdown<CountdownType> countdownSpeed;
-        private LabelledNumberBox countdownOffset;
+        protected LabelledSwitchButton EnableCountdown;
+        protected LabelledEnumDropdown<CountdownType> CountdownSpeed;
+        protected LabelledNumberBox CountdownOffset;
 
         private LabelledSwitchButton widescreenSupport;
         private LabelledSwitchButton epilepsyWarning;
         private LabelledSwitchButton letterboxDuringBreaks;
 
+        private FillFlowContainer countdownSettings;
+
         public override LocalisableString Title => "Design";
 
         [BackgroundDependencyLoader]
@@ -34,7 +35,7 @@ namespace osu.Game.Screens.Edit.Setup
         {
             Children = new[]
             {
-                enableCountdown = new LabelledSwitchButton
+                EnableCountdown = new LabelledSwitchButton
                 {
                     Label = "Enable countdown",
                     Current = { Value = Beatmap.BeatmapInfo.Countdown != CountdownType.None },
@@ -48,13 +49,13 @@ namespace osu.Game.Screens.Edit.Setup
                     Direction = FillDirection.Vertical,
                     Children = new Drawable[]
                     {
-                        countdownSpeed = new LabelledEnumDropdown<CountdownType>
+                        CountdownSpeed = new LabelledEnumDropdown<CountdownType>
                         {
                             Label = "Countdown speed",
                             Current = { Value = Beatmap.BeatmapInfo.Countdown != CountdownType.None ? Beatmap.BeatmapInfo.Countdown : CountdownType.Normal },
                             Items = Enum.GetValues(typeof(CountdownType)).Cast<CountdownType>().Where(type => type != CountdownType.None)
                         },
-                        countdownOffset = new LabelledNumberBox
+                        CountdownOffset = new LabelledNumberBox
                         {
                             Label = "Countdown offset",
                             Current = { Value = Beatmap.BeatmapInfo.CountdownOffset.ToString() },
@@ -88,12 +89,12 @@ namespace osu.Game.Screens.Edit.Setup
         {
             base.LoadComplete();
 
-            enableCountdown.Current.BindValueChanged(_ => updateCountdownSettingsVisibility(), true);
+            EnableCountdown.Current.BindValueChanged(_ => updateCountdownSettingsVisibility(), true);
             countdownSettings.FinishTransforms(true);
 
-            enableCountdown.Current.BindValueChanged(_ => updateBeatmap());
-            countdownSpeed.Current.BindValueChanged(_ => updateBeatmap());
-            countdownOffset.OnCommit += (_, __) => updateBeatmap();
+            EnableCountdown.Current.BindValueChanged(_ => updateBeatmap());
+            CountdownSpeed.Current.BindValueChanged(_ => updateBeatmap());
+            CountdownOffset.OnCommit += (_, __) => onOffsetCommitted();
 
             widescreenSupport.Current.BindValueChanged(_ => updateBeatmap());
             epilepsyWarning.Current.BindValueChanged(_ => updateBeatmap());
@@ -102,7 +103,7 @@ namespace osu.Game.Screens.Edit.Setup
 
         private void updateCountdownSettingsVisibility()
         {
-            bool countdownEnabled = enableCountdown.Current.Value;
+            bool countdownEnabled = EnableCountdown.Current.Value;
 
             foreach (var child in countdownSettings)
             {
@@ -111,10 +112,17 @@ namespace osu.Game.Screens.Edit.Setup
             }
         }
 
+        private void onOffsetCommitted()
+        {
+            updateBeatmap();
+            // update displayed text to ensure parsed value matches display (i.e. if empty string was provided).
+            CountdownOffset.Current.Value = Beatmap.BeatmapInfo.CountdownOffset.ToString(CultureInfo.InvariantCulture);
+        }
+
         private void updateBeatmap()
         {
-            Beatmap.BeatmapInfo.Countdown = enableCountdown.Current.Value ? countdownSpeed.Current.Value : CountdownType.None;
-            Beatmap.BeatmapInfo.CountdownOffset = int.TryParse(countdownOffset.Current.Value, NumberStyles.None, CultureInfo.InvariantCulture, out int offset) ? offset : 0;
+            Beatmap.BeatmapInfo.Countdown = EnableCountdown.Current.Value ? CountdownSpeed.Current.Value : CountdownType.None;
+            Beatmap.BeatmapInfo.CountdownOffset = int.TryParse(CountdownOffset.Current.Value, NumberStyles.None, CultureInfo.InvariantCulture, out int offset) ? offset : 0;
 
             Beatmap.BeatmapInfo.WidescreenStoryboard = widescreenSupport.Current.Value;
             Beatmap.BeatmapInfo.EpilepsyWarning = epilepsyWarning.Current.Value;