diff --git a/osu.Game/Overlays/Mods/ModColumn.cs b/osu.Game/Overlays/Mods/ModColumn.cs
index df2a7780d3..5da57ee4ed 100644
--- a/osu.Game/Overlays/Mods/ModColumn.cs
+++ b/osu.Game/Overlays/Mods/ModColumn.cs
@@ -206,8 +206,12 @@ namespace osu.Game.Overlays.Mods
         {
             pendingSelectionOperations.Clear();
 
-            foreach (var button in availableMods.Where(b => b.Active.Value && b.MatchingFilter.Value))
+            foreach (var button in availableMods.Where(b => b.Active.Value))
                 pendingSelectionOperations.Enqueue(() => button.Active.Value = false);
+
+            //If column is hidden trigger selection manually
+            if (Alpha == 0f)
+                Update();
         }
 
         /// <summary>
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index fa39c2b09d..d2af305d68 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -206,16 +206,6 @@ namespace osu.Game.Overlays.Mods
                 });
             }
 
-            MainAreaContent.Add(new Container
-            {
-                Anchor = Anchor.TopRight,
-                Origin = Anchor.TopRight,
-                AutoSizeAxes = Axes.X,
-                Height = ModsEffectDisplay.HEIGHT,
-                Margin = new MarginPadding { Horizontal = 100 },
-                Child = new ModSearchContainer()
-            });
-
             FooterContent.Child = footerButtonFlow = new FillFlowContainer<ShearedButton>
             {
                 RelativeSizeAxes = Axes.X,