diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MatchStartControl.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MatchStartControl.cs
index c812dbd1a7..203321522b 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MatchStartControl.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MatchStartControl.cs
@@ -256,7 +256,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
 
         public bool OnPressed(KeyBindingPressEvent<GlobalAction> e)
         {
-            if (!readyButton.Enabled.Value)
+            if (e.Repeat)
             {
                 return false;
             }
@@ -264,7 +264,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
             switch (e.Action)
             {
                 case GlobalAction.MultiplayerReady:
-                    onReadyButtonClick();
+                    readyButton.TriggerClick();
                     return true;
 
                 default:
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerSpectateButton.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerSpectateButton.cs
index 5f7ced4ed3..ae6ae01d86 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerSpectateButton.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerSpectateButton.cs
@@ -109,7 +109,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
 
         public bool OnPressed(KeyBindingPressEvent<GlobalAction> e)
         {
-            if (operationInProgress.Value)
+            if (e.Repeat)
             {
                 return false;
             }
@@ -117,7 +117,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
             switch (e.Action)
             {
                 case GlobalAction.MultiplayerSpectate:
-                    onClick();
+                    button.TriggerClick();
                     return true;
 
                 default: