diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index ce798ae752..30d7b6191e 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -508,6 +508,11 @@ namespace osu.Game.Overlays.Mods
 
             modSettingsArea.ResizeHeightTo(modAreaHeight, transition_duration, Easing.InOutCubic);
             TopLevelContent.MoveToY(-modAreaHeight, transition_duration, Easing.InOutCubic);
+
+            if (customisationVisible.Value)
+                GetContainingInputManager().ChangeFocus(modSettingsArea);
+            else
+                Scheduler.Add(() => GetContainingInputManager().ChangeFocus(null));
         }
 
         /// <summary>
@@ -622,7 +627,7 @@ namespace osu.Game.Overlays.Mods
             }
 
             if (textSearchStartsActive.Value)
-                SearchTextBox.TakeFocus();
+                SearchTextBox.HoldFocus = true;
         }
 
         protected override void PopOut()
@@ -761,11 +766,9 @@ namespace osu.Game.Overlays.Mods
                 return false;
 
             // TODO: should probably eventually support typical platform search shortcuts (`Ctrl-F`, `/`)
-            if (SearchTextBox.HasFocus)
-                SearchTextBox.KillFocus();
-            else
+            SearchTextBox.HoldFocus = !SearchTextBox.HoldFocus;
+            if (SearchTextBox.HoldFocus)
                 SearchTextBox.TakeFocus();
-
             return true;
         }
 
diff --git a/osu.Game/Overlays/Mods/ModSettingsArea.cs b/osu.Game/Overlays/Mods/ModSettingsArea.cs
index 6158c2c70f..54bfcc7199 100644
--- a/osu.Game/Overlays/Mods/ModSettingsArea.cs
+++ b/osu.Game/Overlays/Mods/ModSettingsArea.cs
@@ -32,6 +32,8 @@ namespace osu.Game.Overlays.Mods
         [Resolved]
         private OverlayColourProvider colourProvider { get; set; } = null!;
 
+        public override bool AcceptsFocus => true;
+
         public ModSettingsArea()
         {
             RelativeSizeAxes = Axes.X;