diff --git a/osu.Game/Overlays/Profile/Sections/BeatmapMetadataContainer.cs b/osu.Game/Overlays/Profile/Sections/BeatmapMetadataContainer.cs
new file mode 100644
index 0000000000..5104f98f9d
--- /dev/null
+++ b/osu.Game/Overlays/Profile/Sections/BeatmapMetadataContainer.cs
@@ -0,0 +1,60 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Cursor;
+using osu.Framework.Localisation;
+using osu.Game.Beatmaps;
+using osu.Game.Graphics.Containers;
+using osu.Game.Graphics.Sprites;
+namespace osu.Game.Overlays.Profile.Sections
+{
+    public class BeatmapMetadataContainer : OsuHoverContainer, IHasTooltip
+    {
+        private readonly BeatmapInfo beatmap;
+
+        public BeatmapMetadataContainer(BeatmapInfo beatmap)
+        {
+            this.beatmap = beatmap;
+            AutoSizeAxes = Axes.Both;
+            TooltipText = $"{beatmap.Metadata.Artist} - {beatmap.Metadata.Title}";
+        }
+
+        public string TooltipText { get; }
+
+        [BackgroundDependencyLoader(true)]
+        private void load(LocalisationEngine locale, BeatmapSetOverlay beatmapSetOverlay)
+        {
+            Action = () =>
+            {
+                if (beatmap.OnlineBeatmapSetID.HasValue) beatmapSetOverlay?.ShowBeatmapSet(beatmap.OnlineBeatmapSetID.Value);
+            };
+
+            Child = new FillFlowContainer
+            {
+                AutoSizeAxes = Axes.Both,
+                Children = new Drawable[]
+                {
+                    new OsuSpriteText
+                    {
+                        Current = locale.GetUnicodePreference(
+                            $"{beatmap.Metadata.TitleUnicode ?? beatmap.Metadata.Title} [{beatmap.Version}] ",
+                            $"{beatmap.Metadata.Title ?? beatmap.Metadata.TitleUnicode} [{beatmap.Version}] "
+                        ),
+                        TextSize = 15,
+                        Font = "Exo2.0-SemiBoldItalic",
+                    },
+                    new OsuSpriteText
+                    {
+                        Current = locale.GetUnicodePreference(beatmap.Metadata.ArtistUnicode, beatmap.Metadata.Artist),
+                        TextSize = 12,
+                        Padding = new MarginPadding { Top = 3 },
+                        Font = "Exo2.0-RegularItalic",
+                    },
+                },
+            };
+        }
+    }
+}
diff --git a/osu.Game/Overlays/Profile/Sections/Ranks/DrawableScore.cs b/osu.Game/Overlays/Profile/Sections/Ranks/DrawableScore.cs
index 35f4778047..6c475cbb26 100644
--- a/osu.Game/Overlays/Profile/Sections/Ranks/DrawableScore.cs
+++ b/osu.Game/Overlays/Profile/Sections/Ranks/DrawableScore.cs
@@ -14,10 +14,8 @@ using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI;
 using OpenTK.Graphics;
 using osu.Framework.Graphics.Shapes;
-using osu.Framework.Graphics.Cursor;
 using osu.Framework.Input;
 using osu.Framework.Extensions.Color4Extensions;
-using osu.Game.Graphics.Containers;
 
 namespace osu.Game.Overlays.Profile.Sections.Ranks
 {
@@ -130,37 +128,7 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
                 Depth = -1,
             });
 
-            metadata.Add(new MetadataContainer(Score.Beatmap.Metadata.Title, Score.Beatmap.Metadata.Artist)
-            {
-                AutoSizeAxes = Axes.Both,
-                Action = () =>
-                {
-                    if (Score.Beatmap.OnlineBeatmapSetID.HasValue) beatmapSetOverlay?.ShowBeatmapSet(Score.Beatmap.OnlineBeatmapSetID.Value);
-                },
-                Child = new FillFlowContainer
-                {
-                    AutoSizeAxes = Axes.Both,
-                    Children = new Drawable[]
-                    {
-                        new OsuSpriteText
-                        {
-                            Current = locale.GetUnicodePreference(
-                                $"{Score.Beatmap.Metadata.TitleUnicode ?? Score.Beatmap.Metadata.Title} [{Score.Beatmap.Version}] ",
-                                $"{Score.Beatmap.Metadata.Title ?? Score.Beatmap.Metadata.TitleUnicode} [{Score.Beatmap.Version}] "
-                            ),
-                            TextSize = 15,
-                            Font = "Exo2.0-SemiBoldItalic",
-                        },
-                        new OsuSpriteText
-                        {
-                            Current = locale.GetUnicodePreference(Score.Beatmap.Metadata.ArtistUnicode, Score.Beatmap.Metadata.Artist),
-                            TextSize = 12,
-                            Padding = new MarginPadding { Top = 3 },
-                            Font = "Exo2.0-RegularItalic",
-                        },
-                    },
-                },
-            });
+            metadata.Add(new BeatmapMetadataContainer(Score.Beatmap));
 
             foreach (Mod mod in Score.Mods)
                 modsContainer.Add(new ModIcon(mod) { Scale = new Vector2(0.5f) });
@@ -181,15 +149,5 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
             underscoreLine.FadeIn(fade_duration, Easing.OutQuint);
             base.OnHoverLost(state);
         }
-
-        private class MetadataContainer : OsuHoverContainer, IHasTooltip
-        {
-            public string TooltipText { get; set; }
-
-            public MetadataContainer(string title, string artist)
-            {
-                TooltipText = $"{artist} - {title}";
-            }
-        }
     }
 }
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 7b479bdba2..c5493ea59f 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -287,6 +287,7 @@
     <Compile Include="Overlays\BeatmapSet\Scores\DrawableTopScore.cs" />
     <Compile Include="Overlays\BeatmapSet\Scores\ScoresContainer.cs" />
     <Compile Include="Online\API\Requests\GetUserBeatmapsRequest.cs" />
+    <Compile Include="Overlays\Profile\Sections\BeatmapMetadataContainer.cs" />
     <Compile Include="Overlays\Profile\Sections\Beatmaps\PaginatedBeatmapContainer.cs" />
     <Compile Include="Overlays\Profile\Sections\PaginatedContainer.cs" />
     <Compile Include="Overlays\Profile\Sections\Ranks\DrawablePerformanceScore.cs" />