diff --git a/osu.Game/Graphics/UserInterfaceV2/LabelledTextBox.cs b/osu.Game/Graphics/UserInterfaceV2/LabelledTextBox.cs
index 2cbe095d0b..290aba3468 100644
--- a/osu.Game/Graphics/UserInterfaceV2/LabelledTextBox.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/LabelledTextBox.cs
@@ -3,6 +3,7 @@
 
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.UserInterface;
 using osu.Game.Graphics.UserInterface;
 
@@ -32,6 +33,11 @@ namespace osu.Game.Graphics.UserInterfaceV2
             set => Component.Text = value;
         }
 
+        public Container TabbableContentContainer
+        {
+            set => Component.TabbableContentContainer = value;
+        }
+
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
diff --git a/osu.Game/Screens/Edit/Setup/SetupScreen.cs b/osu.Game/Screens/Edit/Setup/SetupScreen.cs
index da8eb3a3b3..a2c8f19016 100644
--- a/osu.Game/Screens/Edit/Setup/SetupScreen.cs
+++ b/osu.Game/Screens/Edit/Setup/SetupScreen.cs
@@ -76,22 +76,26 @@ namespace osu.Game.Screens.Edit.Setup
                                     artistTextBox = new LabelledTextBox
                                     {
                                         Label = "Artist",
-                                        Current = { Value = Beatmap.Value.Metadata.Artist }
+                                        Current = { Value = Beatmap.Value.Metadata.Artist },
+                                        TabbableContentContainer = this
                                     },
                                     titleTextBox = new LabelledTextBox
                                     {
                                         Label = "Title",
-                                        Current = { Value = Beatmap.Value.Metadata.Title }
+                                        Current = { Value = Beatmap.Value.Metadata.Title },
+                                        TabbableContentContainer = this
                                     },
                                     creatorTextBox = new LabelledTextBox
                                     {
                                         Label = "Creator",
-                                        Current = { Value = Beatmap.Value.Metadata.AuthorString }
+                                        Current = { Value = Beatmap.Value.Metadata.AuthorString },
+                                        TabbableContentContainer = this
                                     },
                                     difficultyTextBox = new LabelledTextBox
                                     {
                                         Label = "Difficulty Name",
-                                        Current = { Value = Beatmap.Value.BeatmapInfo.Version }
+                                        Current = { Value = Beatmap.Value.BeatmapInfo.Version },
+                                        TabbableContentContainer = this
                                     },
                                 }
                             },