diff --git a/osu.Game/Screens/Play/KeyCounterDisplay.cs b/osu.Game/Screens/Play/KeyCounterDisplay.cs
index 2ed4afafd3..66a44e5314 100644
--- a/osu.Game/Screens/Play/KeyCounterDisplay.cs
+++ b/osu.Game/Screens/Play/KeyCounterDisplay.cs
@@ -33,8 +33,6 @@ namespace osu.Game.Screens.Play
 
         public KeyCounterDisplay()
         {
-            AutoSizeAxes = Axes.Both;
-
             InternalChild = KeyFlow = new FillFlowContainer<KeyCounter>
             {
                 Direction = FillDirection.Horizontal,
@@ -42,6 +40,15 @@ namespace osu.Game.Screens.Play
             };
         }
 
+        protected override void Update()
+        {
+            base.Update();
+
+            // Don't use autosize as it will shrink to zero when KeyFlow is hidden.
+            // In turn this can cause the display to be masked off screen and never become visible again.
+            Size = KeyFlow.Size;
+        }
+
         public override void Add(KeyCounter key)
         {
             if (key == null) throw new ArgumentNullException(nameof(key));