diff --git a/osu.Game/Overlays/BeatmapSet/LeaderboardModSelector.cs b/osu.Game/Overlays/BeatmapSet/LeaderboardModSelector.cs
index 03d2e6ce4b..1e10c41478 100644
--- a/osu.Game/Overlays/BeatmapSet/LeaderboardModSelector.cs
+++ b/osu.Game/Overlays/BeatmapSet/LeaderboardModSelector.cs
@@ -57,12 +57,13 @@ namespace osu.Game.Overlays.BeatmapSet
 
             modsContainer.Add(new ModButton(new NoMod()));
 
-            foreach (var mod in ruleset.NewValue.CreateInstance().GetAllMods())
+            ruleset.NewValue.CreateInstance().GetAllMods().ForEach(mod =>
+            {
                 if (mod.Ranked)
                     modsContainer.Add(new ModButton(mod));
+            });
 
-            foreach (var mod in modsContainer)
-                mod.OnSelectionChanged += selectionChanged;
+            modsContainer.ForEach(button => button.OnSelectionChanged += selectionChanged);
         }
 
         private void selectionChanged(Mod mod, bool selected)
@@ -74,11 +75,39 @@ namespace osu.Game.Overlays.BeatmapSet
             else
                 mods.Remove(mod);
 
+            if (!mods.Any() && !IsHovered)
+                modsContainer.ForEach(button => button.Highlighted.Value = true);
+
             SelectedMods.Value = mods;
         }
 
+        protected override bool OnHover(HoverEvent e)
+        {
+            if (!SelectedMods.Value.Any())
+                dehighlightAll();
+
+            return base.OnHover(e);
+        }
+
+        protected override void OnHoverLost(HoverLostEvent e)
+        {
+            base.OnHoverLost(e);
+
+            if (!SelectedMods.Value.Any())
+                modsContainer.ForEach(mod => mod.Highlighted.Value = true);
+        }
+
         public void DeselectAll() => modsContainer.ForEach(mod => mod.Selected.Value = false);
 
+        private void dehighlightAll()
+        {
+            modsContainer.ForEach(button =>
+            {
+                if (!button.IsHovered)
+                    button.Highlighted.Value = false;
+            });
+        }
+
         private class ModButton : ModIcon
         {
             private const float mod_scale = 0.4f;
@@ -98,11 +127,13 @@ namespace osu.Game.Overlays.BeatmapSet
             {
                 base.LoadComplete();
 
+                Highlighted.Value = true;
+
                 Selected.BindValueChanged(selected =>
                 {
                     updateState();
                     OnSelectionChanged?.Invoke(Mod, selected.NewValue);
-                }, true);
+                });
             }
 
             protected override bool OnClick(ClickEvent e)
diff --git a/osu.Game/Rulesets/UI/ModIcon.cs b/osu.Game/Rulesets/UI/ModIcon.cs
index e713216f35..1bcd2dc780 100644
--- a/osu.Game/Rulesets/UI/ModIcon.cs
+++ b/osu.Game/Rulesets/UI/ModIcon.cs
@@ -115,7 +115,7 @@ namespace osu.Game.Rulesets.UI
         protected override void LoadComplete()
         {
             base.LoadComplete();
-            Highlighted.BindValueChanged(OnHighlightedChange, true);
+            Highlighted.BindValueChanged(OnHighlightedChange);
         }
 
         protected virtual void OnHighlightedChange(ValueChangedEvent<bool> highlighted)