diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs
index dea1c4b9b4..65b554b27b 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs
@@ -109,11 +109,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                 dropdown.Current.Value = dropdown.ItemSource.ElementAt(1);
             });
 
-            AddStep("expand header", () =>
-            {
-                InputManager.MoveMouseTo(control.ChildrenOfType<CollectionFilterDropdown.CollectionDropdownHeader>().Single());
-                InputManager.Click(MouseButton.Left);
-            });
+            addExpandHeaderStep();
 
             AddStep("change name", () => collectionManager.Collections[0].Name.Value = "First");
 
@@ -124,30 +120,24 @@ namespace osu.Game.Tests.Visual.SongSelect
         [Test]
         public void TestAllBeatmapFilterDoesNotHaveAddButton()
         {
-            AddAssert("'All beatmaps' filter does not have add button", () => !getCollectionDropdownItems().First().ChildrenOfType<IconButton>().Single().IsPresent);
+            addExpandHeaderStep();
+            AddStep("hover all beatmaps", () => InputManager.MoveMouseTo(getAddOrRemoveButton(0)));
+            AddAssert("'All beatmaps' filter does not have add button", () => !getAddOrRemoveButton(0).IsPresent);
         }
 
         [Test]
         public void TestCollectionFilterHasAddButton()
         {
-            AddStep("expand header", () =>
-            {
-                InputManager.MoveMouseTo(control.ChildrenOfType<CollectionFilterDropdown.CollectionDropdownHeader>().Single());
-                InputManager.Click(MouseButton.Left);
-            });
-
+            addExpandHeaderStep();
             AddStep("add collection", () => collectionManager.Collections.Add(new BeatmapCollection { Name = { Value = "1" } }));
-            AddAssert("collection has add button", () => !getAddOrRemoveButton(0).IsPresent);
+            AddStep("hover collection", () => InputManager.MoveMouseTo(getAddOrRemoveButton(1)));
+            AddAssert("collection has add button", () => getAddOrRemoveButton(1).IsPresent);
         }
 
         [Test]
         public void TestButtonDisabledAndEnabledWithBeatmapChanges()
         {
-            AddStep("expand header", () =>
-            {
-                InputManager.MoveMouseTo(control.ChildrenOfType<CollectionFilterDropdown.CollectionDropdownHeader>().Single());
-                InputManager.Click(MouseButton.Left);
-            });
+            addExpandHeaderStep();
 
             AddStep("add collection", () => collectionManager.Collections.Add(new BeatmapCollection { Name = { Value = "1" } }));
 
@@ -161,45 +151,37 @@ namespace osu.Game.Tests.Visual.SongSelect
         [Test]
         public void TestButtonChangesWhenAddedAndRemovedFromCollection()
         {
-            AddStep("expand header", () =>
-            {
-                InputManager.MoveMouseTo(control.ChildrenOfType<CollectionFilterDropdown.CollectionDropdownHeader>().Single());
-                InputManager.Click(MouseButton.Left);
-            });
+            addExpandHeaderStep();
 
             AddStep("select available beatmap", () => Beatmap.Value = beatmapManager.GetWorkingBeatmap(beatmapManager.GetAllUsableBeatmapSets().First().Beatmaps[0]));
 
             AddStep("add collection", () => collectionManager.Collections.Add(new BeatmapCollection { Name = { Value = "1" } }));
-            AddAssert("button is plus", () => getAddOrRemoveButton(1).Icon.Equals(FontAwesome.Solid.PlusCircle));
+            AddAssert("button is plus", () => getAddOrRemoveButton(1).Icon.Equals(FontAwesome.Solid.PlusSquare));
 
             AddStep("add beatmap to collection", () => collectionManager.Collections[0].Beatmaps.Add(Beatmap.Value.BeatmapInfo));
-            AddAssert("button is minus", () => getAddOrRemoveButton(1).Icon.Equals(FontAwesome.Solid.MinusCircle));
+            AddAssert("button is minus", () => getAddOrRemoveButton(1).Icon.Equals(FontAwesome.Solid.MinusSquare));
 
             AddStep("remove beatmap from collection", () => collectionManager.Collections[0].Beatmaps.Clear());
-            AddAssert("button is plus", () => getAddOrRemoveButton(1).Icon.Equals(FontAwesome.Solid.PlusCircle));
+            AddAssert("button is plus", () => getAddOrRemoveButton(1).Icon.Equals(FontAwesome.Solid.PlusSquare));
         }
 
         [Test]
         public void TestButtonAddsAndRemovesBeatmap()
         {
-            AddStep("expand header", () =>
-            {
-                InputManager.MoveMouseTo(control.ChildrenOfType<CollectionFilterDropdown.CollectionDropdownHeader>().Single());
-                InputManager.Click(MouseButton.Left);
-            });
+            addExpandHeaderStep();
 
             AddStep("select available beatmap", () => Beatmap.Value = beatmapManager.GetWorkingBeatmap(beatmapManager.GetAllUsableBeatmapSets().First().Beatmaps[0]));
 
             AddStep("add collection", () => collectionManager.Collections.Add(new BeatmapCollection { Name = { Value = "1" } }));
-            AddAssert("button is plus", () => getAddOrRemoveButton(1).Icon.Equals(FontAwesome.Solid.PlusCircle));
+            AddAssert("button is plus", () => getAddOrRemoveButton(1).Icon.Equals(FontAwesome.Solid.PlusSquare));
 
             addClickAddOrRemoveButtonStep(1);
             AddAssert("collection contains beatmap", () => collectionManager.Collections[0].Beatmaps.Contains(Beatmap.Value.BeatmapInfo));
-            AddAssert("button is minus", () => getAddOrRemoveButton(1).Icon.Equals(FontAwesome.Solid.MinusCircle));
+            AddAssert("button is minus", () => getAddOrRemoveButton(1).Icon.Equals(FontAwesome.Solid.MinusSquare));
 
             addClickAddOrRemoveButtonStep(1);
             AddAssert("collection does not contain beatmap", () => !collectionManager.Collections[0].Beatmaps.Contains(Beatmap.Value.BeatmapInfo));
-            AddAssert("button is plus", () => getAddOrRemoveButton(1).Icon.Equals(FontAwesome.Solid.PlusCircle));
+            AddAssert("button is plus", () => getAddOrRemoveButton(1).Icon.Equals(FontAwesome.Solid.PlusSquare));
         }
 
         private void assertCollectionHeaderDisplays(string collectionName, bool shouldDisplay = true)
@@ -214,14 +196,17 @@ namespace osu.Game.Tests.Visual.SongSelect
         private IconButton getAddOrRemoveButton(int index)
             => getCollectionDropdownItems().ElementAt(index).ChildrenOfType<IconButton>().Single();
 
-        private void addClickAddOrRemoveButtonStep(int index)
+        private void addExpandHeaderStep() => AddStep("expand header", () =>
         {
-            AddStep("click add or remove button", () =>
-            {
-                InputManager.MoveMouseTo(getAddOrRemoveButton(index));
-                InputManager.Click(MouseButton.Left);
-            });
-        }
+            InputManager.MoveMouseTo(control.ChildrenOfType<CollectionFilterDropdown.CollectionDropdownHeader>().Single());
+            InputManager.Click(MouseButton.Left);
+        });
+
+        private void addClickAddOrRemoveButtonStep(int index) => AddStep("click add or remove button", () =>
+        {
+            InputManager.MoveMouseTo(getAddOrRemoveButton(index));
+            InputManager.Click(MouseButton.Left);
+        });
 
         private IEnumerable<Dropdown<CollectionFilter>.DropdownMenu.DrawableDropdownMenuItem> getCollectionDropdownItems()
             => control.ChildrenOfType<CollectionFilterDropdown>().Single().ChildrenOfType<Dropdown<CollectionFilter>.DropdownMenu.DrawableDropdownMenuItem>();
diff --git a/osu.Game/Screens/Select/CollectionFilterDropdown.cs b/osu.Game/Screens/Select/CollectionFilterDropdown.cs
index c4b98fa854..4e9e12fcaf 100644
--- a/osu.Game/Screens/Select/CollectionFilterDropdown.cs
+++ b/osu.Game/Screens/Select/CollectionFilterDropdown.cs
@@ -184,9 +184,7 @@ namespace osu.Game.Screens.Select
                     Anchor = Anchor.CentreRight,
                     Origin = Anchor.CentreRight,
                     X = -OsuScrollContainer.SCROLL_BAR_HEIGHT,
-                    Scale = new Vector2(0.7f),
-                    AlwaysPresent = true,
-                    Alpha = collectionBeatmaps == null ? 0 : 1,
+                    Scale = new Vector2(0.65f),
                     Action = addOrRemove,
                 });
             }
@@ -204,6 +202,8 @@ namespace osu.Game.Screens.Select
                 // Although the DrawableMenuItem binds to value changes of the item's text, the item is an internal implementation detail of Dropdown that has no knowledge
                 // of the underlying CollectionFilter value and its accompanying name, so the real name has to be copied here. Without this, the collection name wouldn't update when changed.
                 collectionName.BindValueChanged(name => content.Text = name.NewValue, true);
+
+                updateButtonVisibility();
             }
 
             protected override bool OnHover(HoverEvent e)
@@ -237,7 +237,13 @@ namespace osu.Game.Screens.Select
                 updateButtonVisibility();
             }
 
-            private void updateButtonVisibility() => addOrRemoveButton.Alpha = IsHovered || IsPreSelected || beatmapInCollection ? 1 : 0;
+            private void updateButtonVisibility()
+            {
+                if (collectionBeatmaps == null)
+                    addOrRemoveButton.Alpha = 0;
+                else
+                    addOrRemoveButton.Alpha = IsHovered || IsPreSelected || beatmapInCollection ? 1 : 0;
+            }
 
             private void addOrRemove()
             {