diff --git a/osu.Game.Tournament/Screens/Ladder/Components/DrawableMatchPairing.cs b/osu.Game.Tournament/Screens/Ladder/Components/DrawableMatchPairing.cs
index 9b50322098..5f58ca0ba5 100644
--- a/osu.Game.Tournament/Screens/Ladder/Components/DrawableMatchPairing.cs
+++ b/osu.Game.Tournament/Screens/Ladder/Components/DrawableMatchPairing.cs
@@ -155,9 +155,9 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
             updateWinConditions();
         }
 
-        protected override bool OnMouseDown(InputState state, MouseDownEventArgs args) => args.Button == MouseButton.Left;
+        protected override bool OnMouseDown(InputState state, MouseDownEventArgs args) => editorInfo.EditingEnabled;
 
-        protected override bool OnDragStart(InputState state) => true;
+        protected override bool OnDragStart(InputState state) => editorInfo.EditingEnabled;
 
         protected override bool OnKeyDown(InputState state, KeyDownEventArgs args)
         {
@@ -183,9 +183,6 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
         {
             if (base.OnDrag(state)) return true;
 
-            if (!editorInfo.EditingEnabled)
-                return false;
-
             Selected = true;
             this.MoveToOffset(state.Mouse.Delta);
 
diff --git a/osu.Game.Tournament/Screens/Ladder/Components/DrawableMatchTeam.cs b/osu.Game.Tournament/Screens/Ladder/Components/DrawableMatchTeam.cs
index 7e3d5f4f2b..b0570a24dc 100644
--- a/osu.Game.Tournament/Screens/Ladder/Components/DrawableMatchTeam.cs
+++ b/osu.Game.Tournament/Screens/Ladder/Components/DrawableMatchTeam.cs
@@ -126,7 +126,8 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
             }, true);
         }
 
-        protected override bool OnMouseDown(InputState state, MouseDownEventArgs args)
+        //TODO: use OnClick instead once we have per-button clicks.
+        protected override bool OnMouseUp(InputState state, MouseUpEventArgs args)
         {
             if (Team == null || editorInfo.EditingEnabled) return false;