diff --git a/osu.Desktop/OsuGameDesktop.cs b/osu.Desktop/OsuGameDesktop.cs
index 6eefee3b50..2079f136d2 100644
--- a/osu.Desktop/OsuGameDesktop.cs
+++ b/osu.Desktop/OsuGameDesktop.cs
@@ -101,7 +101,7 @@ namespace osu.Desktop
             LoadComponentAsync(new DiscordRichPresence(), Add);
 
             if (RuntimeInfo.OS == RuntimeInfo.Platform.Windows)
-                LoadComponentAsync(new GameplayWinKeyHandler(ScreenStack), Add);
+                LoadComponentAsync(new GameplayWinKeyBlocker(), Add);
         }
 
         protected override void ScreenChanged(IScreen lastScreen, IScreen newScreen)
diff --git a/osu.Desktop/Windows/GameplayWinKeyHandler.cs b/osu.Desktop/Windows/GameplayWinKeyBlocker.cs
similarity index 55%
rename from osu.Desktop/Windows/GameplayWinKeyHandler.cs
rename to osu.Desktop/Windows/GameplayWinKeyBlocker.cs
index 96154356d0..86174ceb90 100644
--- a/osu.Desktop/Windows/GameplayWinKeyHandler.cs
+++ b/osu.Desktop/Windows/GameplayWinKeyBlocker.cs
@@ -1,49 +1,38 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Platform;
 using osu.Game.Configuration;
-using osu.Game.Screens;
-using osu.Game.Screens.Play;
 
 namespace osu.Desktop.Windows
 {
-    public class GameplayWinKeyHandler : Component
+    public class GameplayWinKeyBlocker : Component
     {
         private Bindable<bool> allowScreenSuspension;
         private Bindable<bool> disableWinKey;
 
-        private readonly OsuScreenStack screenStack;
         private GameHost host;
 
-        private Type currentScreenType => screenStack.CurrentScreen?.GetType();
-
-        public GameplayWinKeyHandler(OsuScreenStack stack)
-        {
-            screenStack = stack;
-        }
-
         [BackgroundDependencyLoader]
         private void load(GameHost host, OsuConfigManager config)
         {
             this.host = host;
 
             allowScreenSuspension = host.AllowScreenSuspension.GetBoundCopy();
-            allowScreenSuspension.ValueChanged += toggleWinKey;
+            allowScreenSuspension.BindValueChanged(_ => updateBlocking());
 
             disableWinKey = config.GetBindable<bool>(OsuSetting.GameplayDisableWinKey);
-            disableWinKey.BindValueChanged(t => allowScreenSuspension.TriggerChange(), true);
+            disableWinKey.BindValueChanged(_ => updateBlocking(), true);
         }
 
-        private void toggleWinKey(ValueChangedEvent<bool> e)
+        private void updateBlocking()
         {
-            var isPlayer = typeof(Player).IsAssignableFrom(currentScreenType) && currentScreenType != typeof(ReplayPlayer);
+            bool shouldDisable = disableWinKey.Value && !allowScreenSuspension.Value;
 
-            if (!e.NewValue && disableWinKey.Value && isPlayer)
+            if (shouldDisable)
                 host.InputThread.Scheduler.Add(WindowsKey.Disable);
             else
                 host.InputThread.Scheduler.Add(WindowsKey.Enable);
diff --git a/osu.Desktop/Windows/WindowsKey.cs b/osu.Desktop/Windows/WindowsKey.cs
index 4a815b135e..f19d741107 100644
--- a/osu.Desktop/Windows/WindowsKey.cs
+++ b/osu.Desktop/Windows/WindowsKey.cs
@@ -21,7 +21,7 @@ namespace osu.Desktop.Windows
         private static IntPtr keyHook;
 
         [StructLayout(LayoutKind.Explicit)]
-        private struct KdDllHookStruct
+        private readonly struct KdDllHookStruct
         {
             [FieldOffset(0)]
             public readonly int VkCode;