diff --git a/osu.Game.Tests/Visual/Online/TestSceneLeaderboardModSelector.cs b/osu.Game.Tests/Visual/Online/TestSceneLeaderboardModSelector.cs
index eb7fe5591d..3a64ac79f6 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneLeaderboardModSelector.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneLeaderboardModSelector.cs
@@ -53,11 +53,12 @@ namespace osu.Game.Tests.Visual.Online
                     });
             });
 
-            AddStep("osu mods", () => ruleset.Value = new OsuRuleset().RulesetInfo);
-            AddStep("mania mods", () => ruleset.Value = new ManiaRuleset().RulesetInfo);
-            AddStep("taiko mods", () => ruleset.Value = new TaikoRuleset().RulesetInfo);
-            AddStep("catch mods", () => ruleset.Value = new CatchRuleset().RulesetInfo);
+            AddStep("osu ruleset", () => ruleset.Value = new OsuRuleset().RulesetInfo);
+            AddStep("mania ruleset", () => ruleset.Value = new ManiaRuleset().RulesetInfo);
+            AddStep("taiko ruleset", () => ruleset.Value = new TaikoRuleset().RulesetInfo);
+            AddStep("catch ruleset", () => ruleset.Value = new CatchRuleset().RulesetInfo);
             AddStep("Deselect all", () => modSelector.DeselectAll());
+            AddStep("null ruleset", () => ruleset.Value = null);
         }
     }
 }
diff --git a/osu.Game/Overlays/BeatmapSet/LeaderboardModSelector.cs b/osu.Game/Overlays/BeatmapSet/LeaderboardModSelector.cs
index 66d78f927a..d09464aba6 100644
--- a/osu.Game/Overlays/BeatmapSet/LeaderboardModSelector.cs
+++ b/osu.Game/Overlays/BeatmapSet/LeaderboardModSelector.cs
@@ -74,10 +74,10 @@ namespace osu.Game.Overlays.BeatmapSet
             else
                 mods.Remove(mod);
 
+            SelectedMods.Value = mods;
+
             if (!mods.Any() && !IsHovered)
                 highlightAll();
-
-            SelectedMods.Value = mods;
         }
 
         protected override bool OnHover(HoverEvent e)
@@ -116,6 +116,7 @@ namespace osu.Game.Overlays.BeatmapSet
                 : base(mod)
             {
                 Scale = new Vector2(mod_scale);
+                Highlighted.Value = true;
                 Add(new HoverClickSounds());
             }
 
@@ -123,8 +124,6 @@ namespace osu.Game.Overlays.BeatmapSet
             {
                 base.LoadComplete();
 
-                Highlighted.Value = true;
-
                 Selected.BindValueChanged(selected =>
                 {
                     updateState();
@@ -152,10 +151,8 @@ namespace osu.Game.Overlays.BeatmapSet
 
             private void updateState() => Highlighted.Value = IsHovered || Selected.Value;
 
-            protected override void OnHighlightedChange(ValueChangedEvent<bool> highlighted)
-            {
+            protected override void OnHighlightedChanged(ValueChangedEvent<bool> highlighted) =>
                 this.FadeColour(highlighted.NewValue ? Color4.White : Color4.Gray, duration, Easing.OutQuint);
-            }
         }
 
         private class NoMod : Mod
diff --git a/osu.Game/Rulesets/UI/ModIcon.cs b/osu.Game/Rulesets/UI/ModIcon.cs
index d3607757ab..b54ddf8f12 100644
--- a/osu.Game/Rulesets/UI/ModIcon.cs
+++ b/osu.Game/Rulesets/UI/ModIcon.cs
@@ -114,10 +114,10 @@ namespace osu.Game.Rulesets.UI
         protected override void LoadComplete()
         {
             base.LoadComplete();
-            Highlighted.BindValueChanged(OnHighlightedChange);
+            Highlighted.BindValueChanged(OnHighlightedChanged, true);
         }
 
-        protected virtual void OnHighlightedChange(ValueChangedEvent<bool> highlighted)
+        protected virtual void OnHighlightedChanged(ValueChangedEvent<bool> highlighted)
         {
             background.Colour = highlighted.NewValue ? highlightedColour : backgroundColour;
         }