diff --git a/osu.Game/Overlays/Options/Sections/General/LoginOptions.cs b/osu.Game/Overlays/Options/Sections/General/LoginOptions.cs
index aca9b02f48..6866ee513f 100644
--- a/osu.Game/Overlays/Options/Sections/General/LoginOptions.cs
+++ b/osu.Game/Overlays/Options/Sections/General/LoginOptions.cs
@@ -111,12 +111,14 @@ private void load(APIAccess api, OsuConfigManager config)
                     {
                         PlaceholderText = "Username",
                         RelativeSizeAxes = Axes.X,
-                        Text = api?.Username ?? string.Empty
+                        Text = api?.Username ?? string.Empty,
+                        TabbableContentContainer = this
                     },
                     password = new OsuPasswordTextBox
                     {
                         PlaceholderText = "Password",
-                        RelativeSizeAxes = Axes.X
+                        RelativeSizeAxes = Axes.X,
+                        TabbableContentContainer = this
                     },
                     new OsuCheckbox
                     {