diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayer.cs
index 71defa2e07..b0ea361dbb 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayer.cs
@@ -4,7 +4,6 @@
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
-using osu.Framework.Graphics.Containers;
 using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Scoring;
@@ -36,8 +35,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         {
             spectatorPlayerClock.WaitingOnFrames.BindTo(waitingOnFrames);
 
-            HUDOverlay.PlayerSettingsOverlay.State.Value = Visibility.Hidden;
-            HUDOverlay.PlayerSettingsOverlay.State.Disabled = true;
+            HUDOverlay.PlayerSettingsOverlay.Expire();
         }
 
         protected override void UpdateAfterChildren()
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayerLoader.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayerLoader.cs
index 52e4a6e012..f28c2a1d48 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayerLoader.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayerLoader.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         [BackgroundDependencyLoader]
         private void load()
         {
-            PlayerSettingsGroups.Alpha = 0f;
+            PlayerSettingsGroups.Expire();
         }
 
         protected override void LogoArriving(OsuLogo logo, bool resuming)
diff --git a/osu.Game/Screens/Play/HUD/PlayerSettingsOverlay.cs b/osu.Game/Screens/Play/HUD/PlayerSettingsOverlay.cs
index efd37194d3..ffcbb06fb3 100644
--- a/osu.Game/Screens/Play/HUD/PlayerSettingsOverlay.cs
+++ b/osu.Game/Screens/Play/HUD/PlayerSettingsOverlay.cs
@@ -57,7 +57,7 @@ namespace osu.Game.Screens.Play.HUD
 
             if (e.ControlPressed)
             {
-                if (e.Key == Key.H && ReplayLoaded && !State.Disabled)
+                if (e.Key == Key.H && ReplayLoaded)
                 {
                     ToggleVisibility();
                     return true;
diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index 919886cae7..2cf2555b3e 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -240,17 +240,13 @@ namespace osu.Game.Screens.Play
 
             if (e.NewValue)
             {
-                if (!PlayerSettingsOverlay.State.Disabled)
-                    PlayerSettingsOverlay.Show();
-
+                PlayerSettingsOverlay.Show();
                 ModDisplay.FadeIn(200);
                 KeyCounter.Margin = new MarginPadding(10) { Bottom = 30 };
             }
             else
             {
-                if (!PlayerSettingsOverlay.State.Disabled)
-                    PlayerSettingsOverlay.Hide();
-
+                PlayerSettingsOverlay.Hide();
                 ModDisplay.Delay(2000).FadeOut(200);
                 KeyCounter.Margin = new MarginPadding(10);
             }