diff --git a/osu.Game/Graphics/UserInterface/HoverClickSounds.cs b/osu.Game/Graphics/UserInterface/HoverClickSounds.cs
index 70d988f60e..8fe20e3566 100644
--- a/osu.Game/Graphics/UserInterface/HoverClickSounds.cs
+++ b/osu.Game/Graphics/UserInterface/HoverClickSounds.cs
@@ -1,11 +1,13 @@
 // 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 System;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Extensions;
 using osu.Framework.Input.Events;
+using osuTK.Input;
 
 namespace osu.Game.Graphics.UserInterface
 {
@@ -16,16 +18,38 @@ namespace osu.Game.Graphics.UserInterface
     public class HoverClickSounds : HoverSounds
     {
         private SampleChannel sampleClick;
+        private readonly MouseButton[] buttons;
 
+        /// <summary>
+        /// Creates an instance that adds sounds on hover and left click only.
+        /// </summary>
+        /// <param name="sampleSet">Set of click samples to play.</param>
         public HoverClickSounds(HoverSampleSet sampleSet = HoverSampleSet.Normal)
-            : base(sampleSet)
+            : this(new[] { MouseButton.Left }, sampleSet)
         {
         }
 
-        protected override bool OnClick(ClickEvent e)
+        /// <summary>
+        /// Creates an instance that adds sounds on hover and on click for any of the buttons specified.
+        /// </summary>
+        /// <param name="buttons">Array of button codes which should trigger the click sound.</param>
+        /// <param name="sampleSet">Set of click samples to play.</param>
+        public HoverClickSounds(MouseButton[] buttons, HoverSampleSet sampleSet = HoverSampleSet.Normal)
+            : base(sampleSet)
         {
-            sampleClick?.Play();
-            return base.OnClick(e);
+            this.buttons = buttons;
+        }
+
+        protected override bool OnMouseUp(MouseUpEvent e)
+        {
+            var index = Array.IndexOf(buttons, e.Button);
+            bool shouldPlayEffect = index > -1 && index < buttons.Length;
+
+            // examine the button pressed first for short-circuiting
+            // in most usages it is more likely that another button was pressed than that the cursor left the drawable bounds
+            if (shouldPlayEffect && Contains(e.ScreenSpaceMousePosition))
+                sampleClick?.Play();
+            return base.OnMouseUp(e);
         }
 
         [BackgroundDependencyLoader]
diff --git a/osu.Game/Graphics/UserInterface/HoverMouseUpSounds.cs b/osu.Game/Graphics/UserInterface/HoverMouseUpSounds.cs
deleted file mode 100644
index dcb443d5aa..0000000000
--- a/osu.Game/Graphics/UserInterface/HoverMouseUpSounds.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-// 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 System.Collections.Generic;
-using osu.Framework.Allocation;
-using osu.Framework.Audio;
-using osu.Framework.Audio.Sample;
-using osu.Framework.Extensions;
-using osu.Framework.Input.Events;
-using osuTK.Input;
-
-namespace osu.Game.Graphics.UserInterface
-{
-    /// <summary>
-    /// Adds hover sounds to a drawable, as well as click sounds upon MouseUp events for selected mouse buttons.
-    /// Intended to be used for controls that can respond to clicks of buttons other than the left mouse button in place of <see cref="HoverClickSounds" />.
-    /// </summary>
-    public class HoverMouseUpSounds : HoverSounds
-    {
-        private SampleChannel sampleClick;
-        private readonly List<MouseButton> buttons;
-
-        public HoverMouseUpSounds(List<MouseButton> buttons, HoverSampleSet sampleSet = HoverSampleSet.Normal)
-            : base(sampleSet)
-        {
-            this.buttons = buttons;
-        }
-
-        protected override bool OnMouseUp(MouseUpEvent e)
-        {
-            if (Contains(e.ScreenSpaceMousePosition) && buttons.Contains(e.Button))
-                sampleClick?.Play();
-            return base.OnMouseUp(e);
-        }
-
-        [BackgroundDependencyLoader]
-        private void load(AudioManager audio)
-        {
-            sampleClick = audio.Samples.Get($@"UI/generic-select{SampleSet.GetDescription()}");
-        }
-    }
-}
diff --git a/osu.Game/Overlays/Mods/ModButton.cs b/osu.Game/Overlays/Mods/ModButton.cs
index ba39360102..f46555dc4b 100644
--- a/osu.Game/Overlays/Mods/ModButton.cs
+++ b/osu.Game/Overlays/Mods/ModButton.cs
@@ -11,7 +11,6 @@ using osu.Game.Graphics.Sprites;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.UI;
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Graphics.Cursor;
 using osu.Framework.Input.Events;
@@ -284,7 +283,7 @@ namespace osu.Game.Overlays.Mods
                     Anchor = Anchor.TopCentre,
                     Font = OsuFont.GetFont(size: 18)
                 },
-                new HoverMouseUpSounds(new List<MouseButton> { MouseButton.Left, MouseButton.Right })
+                new HoverClickSounds(new[] { MouseButton.Left, MouseButton.Right })
             };
 
             Mod = mod;