diff --git a/osu.Game/Screens/OnlinePlay/FooterButtonFreeModsV2.cs b/osu.Game/Screens/OnlinePlay/FooterButtonFreeModsV2.cs
index f2ed75aed7..a2194a5d2f 100644
--- a/osu.Game/Screens/OnlinePlay/FooterButtonFreeModsV2.cs
+++ b/osu.Game/Screens/OnlinePlay/FooterButtonFreeModsV2.cs
@@ -41,7 +41,7 @@ namespace osu.Game.Screens.OnlinePlay
         [Resolved]
         private OverlayColourProvider colourProvider { get; set; } = null!;
 
-        private Drawable modsWedge = null!;
+        private Container modsWedge = null!;
         private ModDisplay modDisplay = null!;
         private Container modContainer = null!;
         private ModCountText overflowModCountDisplay = null!;
@@ -58,7 +58,7 @@ namespace osu.Game.Screens.OnlinePlay
             Icon = FontAwesome.Solid.ExchangeAlt;
             AccentColour = colours.Lime1;
 
-            Add(modsWedge = new Container
+            Add(modsWedge = new InputBlockingContainer
             {
                 Y = -5f,
                 Depth = float.MaxValue,
diff --git a/osu.Game/Screens/SelectV2/FooterButtonMods.cs b/osu.Game/Screens/SelectV2/FooterButtonMods.cs
index 2da98790a7..112f53a53e 100644
--- a/osu.Game/Screens/SelectV2/FooterButtonMods.cs
+++ b/osu.Game/Screens/SelectV2/FooterButtonMods.cs
@@ -85,7 +85,7 @@ namespace osu.Game.Screens.SelectV2
             AddRange(new[]
             {
                 unrankedBadge = new UnrankedBadge(),
-                modDisplayBar = new ModDisplayBarContainer
+                modDisplayBar = new InputBlockingContainer
                 {
                     Y = -5f,
                     Depth = float.MaxValue,
@@ -343,14 +343,7 @@ namespace osu.Game.Screens.SelectV2
             }
         }
 
-        internal partial class ModDisplayBarContainer : Container
-        {
-            protected override bool OnMouseDown(MouseDownEvent e) => true;
-
-            protected override bool OnHover(HoverEvent e) => true;
-        }
-
-        internal partial class UnrankedBadge : CompositeDrawable, IHasTooltip
+        internal partial class UnrankedBadge : InputBlockingContainer, IHasTooltip
         {
             public LocalisableString TooltipText { get; }
 
@@ -393,10 +386,6 @@ namespace osu.Game.Screens.SelectV2
                     }
                 };
             }
-
-            protected override bool OnMouseDown(MouseDownEvent e) => true;
-
-            protected override bool OnHover(HoverEvent e) => true;
         }
     }
 }