diff --git a/osu.Game/Beatmaps/Drawables/Cards/HoverHandlingContainer.cs b/osu.Game/Beatmaps/Drawables/Cards/HoverHandlingContainer.cs
index 1e2c616332..fe37616755 100644
--- a/osu.Game/Beatmaps/Drawables/Cards/HoverHandlingContainer.cs
+++ b/osu.Game/Beatmaps/Drawables/Cards/HoverHandlingContainer.cs
@@ -14,14 +14,16 @@ public class HoverHandlingContainer : Container
         public Func<HoverEvent, bool>? Hovered { get; set; }
         public Action<HoverLostEvent>? Unhovered { get; set; }
 
-        protected override bool OnHover(HoverEvent e) => Hovered?.Invoke(e) ?? base.OnHover(e);
+        protected override bool OnHover(HoverEvent e)
+        {
+            bool handledByBase = base.OnHover(e);
+            return Hovered?.Invoke(e) ?? handledByBase;
+        }
 
         protected override void OnHoverLost(HoverLostEvent e)
         {
-            if (Unhovered != null)
-                Unhovered?.Invoke(e);
-            else
-                base.OnHoverLost(e);
+            base.OnHoverLost(e);
+            Unhovered?.Invoke(e);
         }
     }
 }