diff --git a/osu.Desktop.Tests/Visual/TestCaseContextMenu.cs b/osu.Desktop.Tests/Visual/TestCaseContextMenu.cs
index f0894f794a..2ac3a28bd4 100644
--- a/osu.Desktop.Tests/Visual/TestCaseContextMenu.cs
+++ b/osu.Desktop.Tests/Visual/TestCaseContextMenu.cs
@@ -3,9 +3,8 @@
 
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.Shapes;
-using osu.Framework.Graphics.UserInterface;
+using osu.Game.Graphics.Cursor;
 using osu.Game.Graphics.UserInterface;
 using OpenTK;
 using OpenTK.Graphics;
@@ -67,9 +66,9 @@ namespace osu.Desktop.Tests.Visual
             );
         }
 
-        private class MyContextMenuContainer : Container, IHasContextMenu
+        private class MyContextMenuContainer : Container, IHasOsuContextMenu
         {
-            public ContextMenuItem[] ContextMenuItems => new ContextMenuItem[]
+            public OsuContextMenuItem[] ContextMenuItems => new[]
             {
                 new OsuContextMenuItem(@"Some option"),
                 new OsuContextMenuItem(@"Highlighted option", MenuItemType.Highlighted),
@@ -81,16 +80,16 @@ namespace osu.Desktop.Tests.Visual
             };
         }
 
-        private class AnotherContextMenuContainer : Container, IHasContextMenu
+        private class AnotherContextMenuContainer : Container, IHasOsuContextMenu
         {
-            public ContextMenuItem[] ContextMenuItems => new ContextMenuItem[]
+            public OsuContextMenuItem[] ContextMenuItems => new[]
             {
                 new OsuContextMenuItem(@"Simple option"),
                 new OsuContextMenuItem(@"Simple very very long option"),
-                new OsuContextMenuItem(@"Change width", MenuItemType.Highlighted) { Action = () => this.ResizeWidthTo(Width * 2, 100, Easing.OutQuint) },
-                new OsuContextMenuItem(@"Change height", MenuItemType.Highlighted) { Action = () => this.ResizeHeightTo(Height * 2, 100, Easing.OutQuint) },
-                new OsuContextMenuItem(@"Change width back", MenuItemType.Destructive) { Action = () => this.ResizeWidthTo(Width / 2, 100, Easing.OutQuint) },
-                new OsuContextMenuItem(@"Change height back", MenuItemType.Destructive) { Action = () => this.ResizeHeightTo(Height / 2, 100, Easing.OutQuint) },
+                new OsuContextMenuItem(@"Change width", MenuItemType.Highlighted, () => this.ResizeWidthTo(Width * 2, 100, Easing.OutQuint)),
+                new OsuContextMenuItem(@"Change height", MenuItemType.Highlighted, () => this.ResizeHeightTo(Height * 2, 100, Easing.OutQuint)),
+                new OsuContextMenuItem(@"Change width back", MenuItemType.Destructive, () => this.ResizeWidthTo(Width / 2, 100, Easing.OutQuint)),
+                new OsuContextMenuItem(@"Change height back", MenuItemType.Destructive, () => this.ResizeHeightTo(Height / 2, 100, Easing.OutQuint)),
             };
         }
     }
diff --git a/osu.Game/Graphics/Cursor/IHasOsuContextMenu.cs b/osu.Game/Graphics/Cursor/IHasOsuContextMenu.cs
new file mode 100644
index 0000000000..6fb1a3d31f
--- /dev/null
+++ b/osu.Game/Graphics/Cursor/IHasOsuContextMenu.cs
@@ -0,0 +1,9 @@
+using osu.Framework.Graphics.Cursor;
+using osu.Game.Graphics.UserInterface;
+
+namespace osu.Game.Graphics.Cursor
+{
+    public interface IHasOsuContextMenu : IHasContextMenu<OsuContextMenuItem>
+    {
+    }
+}
diff --git a/osu.Game/Graphics/Cursor/OsuContextMenuContainer.cs b/osu.Game/Graphics/Cursor/OsuContextMenuContainer.cs
index 9162fd6893..4ee3e31707 100644
--- a/osu.Game/Graphics/Cursor/OsuContextMenuContainer.cs
+++ b/osu.Game/Graphics/Cursor/OsuContextMenuContainer.cs
@@ -7,8 +7,8 @@ using osu.Game.Graphics.UserInterface;
 
 namespace osu.Game.Graphics.Cursor
 {
-    public class OsuContextMenuContainer : ContextMenuContainer
+    public class OsuContextMenuContainer : ContextMenuContainer<OsuContextMenuItem>
     {
-        protected override ContextMenu<ContextMenuItem> CreateContextMenu() => new OsuContextMenu<ContextMenuItem>();
+        protected override Menu<OsuContextMenuItem> CreateMenu() => new OsuContextMenu<OsuContextMenuItem>();
     }
 }
\ No newline at end of file
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 97cf1db803..0c710fd242 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -84,6 +84,7 @@
     <Compile Include="Graphics\Containers\OsuClickableContainer.cs" />
     <Compile Include="Graphics\Containers\OsuFocusedOverlayContainer.cs" />
     <Compile Include="Graphics\Containers\OsuScrollContainer.cs" />
+    <Compile Include="Graphics\Cursor\IHasOsuContextMenu.cs" />
     <Compile Include="Graphics\Cursor\OsuContextMenuContainer.cs" />
     <Compile Include="Graphics\Containers\OsuTextFlowContainer.cs" />
     <Compile Include="Graphics\UserInterface\IconButton.cs" />