diff --git a/osu-framework b/osu-framework
index cc39713fbf..241133f0a6 160000
--- a/osu-framework
+++ b/osu-framework
@@ -1 +1 @@
-Subproject commit cc39713fbf9427aa53df91e27ecd09d15661089f
+Subproject commit 241133f0a65326a563ba23b7166167a882d1d5cb
diff --git a/osu.Game/Graphics/UserInterface/FocusedTextBox.cs b/osu.Game/Graphics/UserInterface/FocusedTextBox.cs
index 6d9bf231c3..33786252ab 100644
--- a/osu.Game/Graphics/UserInterface/FocusedTextBox.cs
+++ b/osu.Game/Graphics/UserInterface/FocusedTextBox.cs
@@ -30,6 +30,9 @@ namespace osu.Game.Graphics.UserInterface
             }
         }
 
+        // We may not be focused yet, but we need to handle keyboard input to be able to request focus
+        public override bool HandleKeyboardInput => HoldFocus || base.HandleKeyboardInput;
+
         protected override void OnFocus(InputState state)
         {
             base.OnFocus(state);