diff --git a/osu.Game/Graphics/Cursor/OsuContextMenuContainer.cs b/osu.Game/Graphics/Cursor/OsuContextMenuContainer.cs
index e64d2d98f4..171ad4ee65 100644
--- a/osu.Game/Graphics/Cursor/OsuContextMenuContainer.cs
+++ b/osu.Game/Graphics/Cursor/OsuContextMenuContainer.cs
@@ -1,6 +1,7 @@
 // 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 osu.Framework.Allocation;
 using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.UserInterface;
 using osu.Game.Graphics.UserInterface;
@@ -9,6 +10,14 @@ namespace osu.Game.Graphics.Cursor
 {
     public class OsuContextMenuContainer : ContextMenuContainer
     {
+        [Cached]
+        private OsuContextMenuSamples samples = new OsuContextMenuSamples();
+
+        public OsuContextMenuContainer()
+        {
+            AddInternal(samples);
+        }
+
         protected override Menu CreateMenu() => new OsuContextMenu(true);
     }
 }
diff --git a/osu.Game/Graphics/UserInterface/OsuContextMenu.cs b/osu.Game/Graphics/UserInterface/OsuContextMenu.cs
index 7cf8b3eca8..cf201b18b4 100644
--- a/osu.Game/Graphics/UserInterface/OsuContextMenu.cs
+++ b/osu.Game/Graphics/UserInterface/OsuContextMenu.cs
@@ -4,8 +4,6 @@
 using osuTK.Graphics;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
-using osu.Framework.Audio.Sample;
-using osu.Framework.Extensions;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Effects;
@@ -16,16 +14,15 @@ namespace osu.Game.Graphics.UserInterface
     public class OsuContextMenu : OsuMenu
     {
         private const int fade_duration = 250;
-        private Sample sampleOpen;
-        private Sample sampleClose;
-        private Sample sampleClick;
+
+        [Resolved]
+        private OsuContextMenuSamples samples { get; set; }
 
         // todo: this shouldn't be required after https://github.com/ppy/osu-framework/issues/4519 is fixed.
         private bool wasOpened;
         private readonly bool playClickSample;
-        private readonly Menu parentMenu;
 
-        public OsuContextMenu(bool playClickSample = false, Menu parentMenu = null)
+        public OsuContextMenu(bool playClickSample = false)
             : base(Direction.Vertical)
         {
             MaskingContainer.CornerRadius = 5;
@@ -41,16 +38,12 @@ namespace osu.Game.Graphics.UserInterface
             MaxHeight = 250;
 
             this.playClickSample = playClickSample;
-            this.parentMenu = parentMenu;
         }
 
         [BackgroundDependencyLoader]
         private void load(OsuColour colours, AudioManager audio)
         {
             BackgroundColour = colours.ContextMenuGray;
-            sampleClick = audio.Samples.Get($"UI/{HoverSampleSet.Default.GetDescription()}-select");
-            sampleOpen = audio.Samples.Get(@"UI/dropdown-open");
-            sampleClose = audio.Samples.Get(@"UI/dropdown-close");
         }
 
         protected override void AnimateOpen()
@@ -58,10 +51,10 @@ namespace osu.Game.Graphics.UserInterface
             this.FadeIn(fade_duration, Easing.OutQuint);
 
             if (playClickSample)
-                sampleClick?.Play();
+                samples.PlayClickSample();
 
             if (!wasOpened)
-                sampleOpen?.Play();
+                samples.PlayOpenSample();
 
             wasOpened = true;
         }
@@ -70,18 +63,12 @@ namespace osu.Game.Graphics.UserInterface
         {
             this.FadeOut(fade_duration, Easing.OutQuint);
 
-            if (parentMenu?.State == MenuState.Closed)
-            {
-                wasOpened = false;
-                return;
-            }
-
             if (wasOpened)
-                sampleClose?.Play();
+                samples.PlayCloseSample();
 
             wasOpened = false;
         }
 
-        protected override Menu CreateSubMenu() => new OsuContextMenu(false, this);
+        protected override Menu CreateSubMenu() => new OsuContextMenu();
     }
 }
diff --git a/osu.Game/Graphics/UserInterface/OsuContextMenuSamples.cs b/osu.Game/Graphics/UserInterface/OsuContextMenuSamples.cs
new file mode 100644
index 0000000000..d67ea499e5
--- /dev/null
+++ b/osu.Game/Graphics/UserInterface/OsuContextMenuSamples.cs
@@ -0,0 +1,35 @@
+// 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 osu.Framework.Allocation;
+using osu.Framework.Audio;
+using osu.Framework.Audio.Sample;
+using osu.Framework.Extensions;
+using osu.Framework.Graphics;
+
+namespace osu.Game.Graphics.UserInterface
+{
+    public class OsuContextMenuSamples : Component
+    {
+        private Sample sampleClick;
+        private Sample sampleOpen;
+        private Sample sampleClose;
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours, AudioManager audio)
+        {
+            sampleClick = audio.Samples.Get($@"UI/{HoverSampleSet.Default.GetDescription()}-select");
+            sampleOpen = audio.Samples.Get(@"UI/dropdown-open");
+            sampleClose = audio.Samples.Get(@"UI/dropdown-close");
+        }
+
+        public void PlayClickSample() => Scheduler.AddOnce(playClickSample);
+        private void playClickSample() => sampleClick.Play();
+
+        public void PlayOpenSample() => Scheduler.AddOnce(playOpenSample);
+        private void playOpenSample() => sampleOpen.Play();
+
+        public void PlayCloseSample() => Scheduler.AddOnce(playCloseSample);
+        private void playCloseSample() => sampleClose.Play();
+    }
+}