diff --git a/osu.Game/Collections/BeatmapCollectionManager.cs b/osu.Game/Collections/BeatmapCollectionManager.cs
index 0b066708d8..3e5976300f 100644
--- a/osu.Game/Collections/BeatmapCollectionManager.cs
+++ b/osu.Game/Collections/BeatmapCollectionManager.cs
@@ -97,7 +97,7 @@ namespace osu.Game.Collections
             {
                 var existing = Collections.FirstOrDefault(c => c.Name == newCol.Name);
                 if (existing == null)
-                    Collections.Add(existing = new BeatmapCollection { Name = newCol.Name });
+                    Collections.Add(existing = new BeatmapCollection { Name = { Value = newCol.Name.Value } });
 
                 foreach (var newBeatmap in newCol.Beatmaps)
                 {
@@ -122,7 +122,7 @@ namespace osu.Game.Collections
 
                     for (int i = 0; i < collectionCount; i++)
                     {
-                        var collection = new BeatmapCollection { Name = sr.ReadString() };
+                        var collection = new BeatmapCollection { Name = { Value = sr.ReadString() } };
                         int mapCount = sr.ReadInt32();
 
                         for (int j = 0; j < mapCount; j++)
@@ -183,7 +183,7 @@ namespace osu.Game.Collections
 
                         foreach (var c in Collections)
                         {
-                            sw.Write(c.Name);
+                            sw.Write(c.Name.Value);
                             sw.Write(c.Beatmaps.Count);
 
                             foreach (var b in c.Beatmaps)
@@ -221,7 +221,7 @@ namespace osu.Game.Collections
         /// </summary>
         public event Action Changed;
 
-        public string Name;
+        public readonly Bindable<string> Name = new Bindable<string>();
 
         public readonly BindableList<BeatmapInfo> Beatmaps = new BindableList<BeatmapInfo>();
 
diff --git a/osu.Game/Collections/DeleteCollectionDialog.cs b/osu.Game/Collections/DeleteCollectionDialog.cs
index 81bedca638..f2b8de7c1e 100644
--- a/osu.Game/Collections/DeleteCollectionDialog.cs
+++ b/osu.Game/Collections/DeleteCollectionDialog.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Collections
         public DeleteCollectionDialog(BeatmapCollection collection)
         {
             HeaderText = "Confirm deletion of";
-            BodyText = collection.Name;
+            BodyText = collection.Name.Value;
 
             Icon = FontAwesome.Regular.TrashAlt;
 
diff --git a/osu.Game/Collections/DrawableCollectionListItem.cs b/osu.Game/Collections/DrawableCollectionListItem.cs
index 67756cdb43..7c1a2e1287 100644
--- a/osu.Game/Collections/DrawableCollectionListItem.cs
+++ b/osu.Game/Collections/DrawableCollectionListItem.cs
@@ -67,7 +67,7 @@ namespace osu.Game.Collections
                                 RelativeSizeAxes = Axes.Both,
                                 Size = Vector2.One,
                                 CornerRadius = item_height / 2,
-                                Text = collection.Name
+                                Current = collection.Name
                             },
                         }
                     },
diff --git a/osu.Game/Collections/ManageCollectionDialog.cs b/osu.Game/Collections/ManageCollectionDialog.cs
index 6a0d815e43..1e222a9c71 100644
--- a/osu.Game/Collections/ManageCollectionDialog.cs
+++ b/osu.Game/Collections/ManageCollectionDialog.cs
@@ -97,7 +97,7 @@ namespace osu.Game.Collections
                                     Size = Vector2.One,
                                     Padding = new MarginPadding(10),
                                     Text = "Create new collection",
-                                    Action = () => collectionManager.Collections.Add(new BeatmapCollection { Name = "My new collection" })
+                                    Action = () => collectionManager.Collections.Add(new BeatmapCollection { Name = { Value = "My new collection" } })
                                 },
                             },
                         }
@@ -120,6 +120,9 @@ namespace osu.Game.Collections
 
             this.FadeOut(exit_duration, Easing.OutQuint);
             this.ScaleTo(0.9f, exit_duration);
+
+            // Ensure that textboxes commit
+            GetContainingInputManager()?.TriggerFocusContention(this);
         }
     }
 }
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
index 8fd428d26e..6c43bf5bed 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
@@ -239,7 +239,7 @@ namespace osu.Game.Screens.Select.Carousel
 
         private MenuItem createCollectionMenuItem(BeatmapCollection collection)
         {
-            return new ToggleMenuItem(collection.Name, MenuItemType.Standard, s =>
+            return new ToggleMenuItem(collection.Name.Value, MenuItemType.Standard, s =>
             {
                 if (s)
                     collection.Beatmaps.Add(beatmap);
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
index 12c6b320e9..fc262730cb 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
@@ -171,7 +171,7 @@ namespace osu.Game.Screens.Select.Carousel
             else
                 state = TernaryState.False;
 
-            return new TernaryStateMenuItem(collection.Name, MenuItemType.Standard, s =>
+            return new TernaryStateMenuItem(collection.Name.Value, MenuItemType.Standard, s =>
             {
                 foreach (var b in beatmapSet.Beatmaps)
                 {
diff --git a/osu.Game/Screens/Select/FilterControl.cs b/osu.Game/Screens/Select/FilterControl.cs
index 0db24f0738..a66bcfb3b1 100644
--- a/osu.Game/Screens/Select/FilterControl.cs
+++ b/osu.Game/Screens/Select/FilterControl.cs
@@ -270,7 +270,7 @@ namespace osu.Game.Screens.Select
                 Current.TriggerChange();
             }
 
-            protected override string GenerateItemText(CollectionFilter item) => item.Collection?.Name ?? "All beatmaps";
+            protected override string GenerateItemText(CollectionFilter item) => item.Collection?.Name.Value ?? "All beatmaps";
 
             protected override DropdownHeader CreateHeader() => new CollectionDropdownHeader();