diff --git a/osu.Game/Overlays/BeatmapSet/Info.cs b/osu.Game/Overlays/BeatmapSet/Info.cs
index 4229b81610..47f0c848b2 100644
--- a/osu.Game/Overlays/BeatmapSet/Info.cs
+++ b/osu.Game/Overlays/BeatmapSet/Info.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -25,26 +26,7 @@ namespace osu.Game.Overlays.BeatmapSet
         private readonly Box successRateBackground;
         private readonly SuccessRate successRate;
 
-        private BeatmapSetInfo beatmapSet;
-
-        public BeatmapSetInfo BeatmapSet
-        {
-            get => beatmapSet;
-            set
-            {
-                if (value == beatmapSet) return;
-
-                beatmapSet = value;
-
-                updateDisplay();
-            }
-        }
-
-        private void updateDisplay()
-        {
-            source.Text = BeatmapSet?.Metadata.Source ?? string.Empty;
-            tags.Text = BeatmapSet?.Metadata.Tags ?? string.Empty;
-        }
+        public readonly Bindable<BeatmapSetInfo> BeatmapSet = new Bindable<BeatmapSetInfo>();
 
         public BeatmapInfo Beatmap
         {
@@ -131,14 +113,18 @@ namespace osu.Game.Overlays.BeatmapSet
                     },
                 },
             };
+
+            BeatmapSet.ValueChanged += b =>
+            {
+                source.Text = b.NewValue?.Metadata.Source ?? string.Empty;
+                tags.Text = b.NewValue?.Metadata.Tags ?? string.Empty;
+            };
         }
 
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
             successRateBackground.Colour = colours.GrayE;
-
-            updateDisplay();
         }
 
         private class MetadataSection : FillFlowContainer
diff --git a/osu.Game/Overlays/BeatmapSetOverlay.cs b/osu.Game/Overlays/BeatmapSetOverlay.cs
index ff8603c749..23ed7bc731 100644
--- a/osu.Game/Overlays/BeatmapSetOverlay.cs
+++ b/osu.Game/Overlays/BeatmapSetOverlay.cs
@@ -3,6 +3,7 @@
 
 using System.Linq;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -36,19 +37,7 @@ namespace osu.Game.Overlays
 
         private readonly ScrollContainer scroll;
 
-        private BeatmapSetInfo beatmapSet;
-
-        public BeatmapSetInfo BeatmapSet
-        {
-            get => beatmapSet;
-            set
-            {
-                if (value == beatmapSet)
-                    return;
-
-                header.BeatmapSet.Value = info.BeatmapSet = beatmapSet = value;
-            }
-        }
+        private readonly Bindable<BeatmapSetInfo> beatmapSet = new Bindable<BeatmapSetInfo>();
 
         // receive input outside our bounds so we can trigger a close event on ourselves.
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => true;
@@ -101,6 +90,9 @@ namespace osu.Game.Overlays
                 },
             };
 
+            header.BeatmapSet.BindTo(beatmapSet);
+            info.BeatmapSet.BindTo(beatmapSet);
+
             header.Picker.Beatmap.ValueChanged += b =>
             {
                 info.Beatmap = b.NewValue;
@@ -124,7 +116,7 @@ namespace osu.Game.Overlays
         protected override void PopOut()
         {
             base.PopOut();
-            FadeEdgeEffectTo(0, WaveContainer.DISAPPEAR_DURATION, Easing.Out).OnComplete(_ => BeatmapSet = null);
+            FadeEdgeEffectTo(0, WaveContainer.DISAPPEAR_DURATION, Easing.Out).OnComplete(_ => beatmapSet.Value = null);
         }
 
         protected override bool OnClick(ClickEvent e)
@@ -135,11 +127,11 @@ namespace osu.Game.Overlays
 
         public void FetchAndShowBeatmap(int beatmapId)
         {
-            BeatmapSet = null;
+            beatmapSet.Value = null;
             var req = new GetBeatmapSetRequest(beatmapId, BeatmapSetLookupType.BeatmapId);
             req.Success += res =>
             {
-                BeatmapSet = res.ToBeatmapSet(rulesets);
+                beatmapSet.Value = res.ToBeatmapSet(rulesets);
                 header.Picker.Beatmap.Value = header.BeatmapSet.Value.Beatmaps.First(b => b.OnlineBeatmapID == beatmapId);
             };
             api.Queue(req);
@@ -148,16 +140,16 @@ namespace osu.Game.Overlays
 
         public void FetchAndShowBeatmapSet(int beatmapSetId)
         {
-            BeatmapSet = null;
+            beatmapSet.Value = null;
             var req = new GetBeatmapSetRequest(beatmapSetId);
-            req.Success += res => BeatmapSet = res.ToBeatmapSet(rulesets);
+            req.Success += res => beatmapSet.Value = res.ToBeatmapSet(rulesets);
             api.Queue(req);
             Show();
         }
 
         public void ShowBeatmapSet(BeatmapSetInfo set)
         {
-            BeatmapSet = set;
+            beatmapSet.Value = set;
             Show();
             scroll.ScrollTo(0);
         }