From 2c8e62ae3589a28fd00dd68a72c20e38f53ca60b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 25 Feb 2021 14:52:51 +0900
Subject: [PATCH] Fix toolbar not completing enough of layout to propagate
 hotkeys to buttons before initial display

---
 osu.Game/Overlays/Toolbar/Toolbar.cs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/osu.Game/Overlays/Toolbar/Toolbar.cs b/osu.Game/Overlays/Toolbar/Toolbar.cs
index 393e349bd0..0ccb22df3a 100644
--- a/osu.Game/Overlays/Toolbar/Toolbar.cs
+++ b/osu.Game/Overlays/Toolbar/Toolbar.cs
@@ -37,6 +37,15 @@ namespace osu.Game.Overlays.Toolbar
         {
             RelativeSizeAxes = Axes.X;
             Size = new Vector2(1, HEIGHT);
+            AlwaysPresent = true;
+        }
+
+        protected override void UpdateAfterChildren()
+        {
+            base.UpdateAfterChildren();
+
+            // this only needed to be set for the initial LoadComplete/Update, so layout completes and gets buttons in a state they can correctly handle keyboard input for hotkeys.
+            AlwaysPresent = false;
         }
 
         [BackgroundDependencyLoader(true)]