diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 43f44d682d..8cb990757f 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -565,9 +565,6 @@ namespace osu.Game.Overlays.Mods
                                                      .ToArray();
 
             SelectedMods.Value = ComputeNewModsFromSelection(SelectedMods.Value, candidateSelection);
-
-            if (SearchTextBox.HasFocus)
-                SearchTextBox.SelectAll();
         }
 
         #region Transition handling
@@ -724,6 +721,8 @@ namespace osu.Game.Overlays.Mods
                     if (firstMod is not null)
                         firstMod.Active.Value = !firstMod.Active.Value;
 
+                    SearchTextBox.SelectAll();
+
                     return true;
                 }
             }