diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
index da41349117..81fbd0d451 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
@@ -503,27 +503,27 @@ namespace osu.Game.Tests.Visual.Gameplay
                 InputManager.Click(MouseButton.Left);
             });
 
-            AddStep("Right-click TopLeft anchor", () =>
+            AddStep("Click TopLeft anchor", () =>
             {
                 InputManager.MoveMouseTo(getMenuItemByText("TopLeft"));
-                InputManager.Click(MouseButton.Right);
+                InputManager.Click(MouseButton.Left);
             });
 
             AddAssert("TopLeft item checked", () => (getMenuItemByText("TopLeft").Item as TernaryStateRadioMenuItem)?.State.Value == TernaryState.True);
 
-            AddStep("Right-click Centre anchor", () =>
+            AddStep("Click Centre anchor", () =>
             {
                 InputManager.MoveMouseTo(getMenuItemByText("Centre"));
-                InputManager.Click(MouseButton.Right);
+                InputManager.Click(MouseButton.Left);
             });
 
             AddAssert("Centre item checked", () => (getMenuItemByText("Centre").Item as TernaryStateRadioMenuItem)?.State.Value == TernaryState.True);
             AddAssert("TopLeft item unchecked", () => (getMenuItemByText("TopLeft").Item as TernaryStateRadioMenuItem)?.State.Value == TernaryState.False);
 
-            AddStep("Right-click Closest anchor", () =>
+            AddStep("Click Closest anchor", () =>
             {
                 InputManager.MoveMouseTo(getMenuItemByText("Closest"));
-                InputManager.Click(MouseButton.Right);
+                InputManager.Click(MouseButton.Left);
             });
 
             AddAssert("Closest item checked", () => (getMenuItemByText("Closest").Item as TernaryStateRadioMenuItem)?.State.Value == TernaryState.True);
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneStatefulMenuItem.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneStatefulMenuItem.cs
index 63497040db..88187f1808 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneStatefulMenuItem.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneStatefulMenuItem.cs
@@ -114,51 +114,6 @@ namespace osu.Game.Tests.Visual.UserInterface
                 => AddAssert($"state is {expected}", () => state.Value == expected);
         }
 
-        [Test]
-        public void TestItemRespondsToRightClick()
-        {
-            OsuMenu menu = null;
-
-            Bindable<TernaryState> state = new Bindable<TernaryState>(TernaryState.Indeterminate);
-
-            AddStep("create menu", () =>
-            {
-                state.Value = TernaryState.Indeterminate;
-
-                Child = menu = new OsuMenu(Direction.Vertical, true)
-                {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    Items = new[]
-                    {
-                        new TernaryStateToggleMenuItem("First"),
-                        new TernaryStateToggleMenuItem("Second") { State = { BindTarget = state } },
-                        new TernaryStateToggleMenuItem("Third") { State = { Value = TernaryState.True } },
-                    }
-                };
-            });
-
-            checkState(TernaryState.Indeterminate);
-
-            click();
-            checkState(TernaryState.True);
-
-            click();
-            checkState(TernaryState.False);
-
-            AddStep("change state via bindable", () => state.Value = TernaryState.True);
-
-            void click() =>
-                AddStep("click", () =>
-                {
-                    InputManager.MoveMouseTo(menu.ScreenSpaceDrawQuad.Centre);
-                    InputManager.Click(MouseButton.Right);
-                });
-
-            void checkState(TernaryState expected)
-                => AddAssert($"state is {expected}", () => state.Value == expected);
-        }
-
         [Test]
         public void TestCustomState()
         {
diff --git a/osu.Game/Graphics/UserInterface/DrawableStatefulMenuItem.cs b/osu.Game/Graphics/UserInterface/DrawableStatefulMenuItem.cs
index 4206f77c98..8812696493 100644
--- a/osu.Game/Graphics/UserInterface/DrawableStatefulMenuItem.cs
+++ b/osu.Game/Graphics/UserInterface/DrawableStatefulMenuItem.cs
@@ -4,9 +4,7 @@
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
-using osu.Framework.Input.Events;
 using osuTK;
-using osuTK.Input;
 
 namespace osu.Game.Graphics.UserInterface
 {
@@ -14,6 +12,8 @@ namespace osu.Game.Graphics.UserInterface
     {
         protected new StatefulMenuItem Item => (StatefulMenuItem)base.Item;
 
+        public override bool CloseMenuOnClick => false;
+
         public DrawableStatefulMenuItem(StatefulMenuItem item)
             : base(item)
         {
@@ -21,19 +21,6 @@ namespace osu.Game.Graphics.UserInterface
 
         protected override TextContainer CreateTextContainer() => new ToggleTextContainer(Item);
 
-        protected override bool OnMouseDown(MouseDownEvent e)
-        {
-            // Right mouse button is a special case where we allow actioning without dismissing the menu.
-            // This is achieved by not calling `Clicked` (as done by the base implementation in OnClick).
-            if (IsActionable && e.Button == MouseButton.Right)
-            {
-                Item.Action.Value?.Invoke();
-                return true;
-            }
-
-            return false;
-        }
-
         private partial class ToggleTextContainer : TextContainer
         {
             private readonly StatefulMenuItem menuItem;