diff --git a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
index 3b5ab811ae..653bfd6d2c 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
@@ -12,14 +12,17 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Localisation;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Resources.Localisation.Web;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.UI;
 using osu.Game.Scoring;
+using osu.Game.Scoring.Drawables;
 using osuTK;
 
 namespace osu.Game.Overlays.BeatmapSet.Scores
@@ -121,7 +124,11 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                 maxComboColumn.Text = value.MaxCombo.ToLocalisableString(@"0\x");
 
                 ppColumn.Alpha = value.BeatmapInfo.Status.GrantsPerformancePoints() ? 1 : 0;
-                ppColumn.Text = value.PP?.ToLocalisableString(@"N0") ?? default;
+
+                if (value.PP is double pp)
+                    ppColumn.Text = pp.ToLocalisableString(@"N0");
+                else
+                    ppColumn.Drawable = new UnprocessedPerformancePointsPlaceholder { Size = new Vector2(smallFont.Size) };
 
                 statisticsColumns.ChildrenEnumerable = value.GetStatisticsForDisplay().Select(createStatisticsColumn);
                 modsColumn.Mods = value.Mods;
@@ -197,30 +204,48 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
             }
         }
 
-        private class TextColumn : InfoColumn
+        private class TextColumn : InfoColumn, IHasCurrentValue<string>
         {
-            private readonly SpriteText text;
-
-            public TextColumn(LocalisableString title, FontUsage font, float? minWidth = null)
-                : this(title, new OsuSpriteText { Font = font }, minWidth)
-            {
-            }
-
-            private TextColumn(LocalisableString title, SpriteText text, float? minWidth = null)
-                : base(title, text, minWidth)
-            {
-                this.text = text;
-            }
+            private readonly OsuTextFlowContainer text;
 
             public LocalisableString Text
             {
                 set => text.Text = value;
             }
 
+            public Drawable Drawable
+            {
+                set
+                {
+                    text.Clear();
+                    text.AddArbitraryDrawable(value);
+                }
+            }
+
+            private Bindable<string> current;
+
             public Bindable<string> Current
             {
-                get => text.Current;
-                set => text.Current = value;
+                get => current;
+                set
+                {
+                    text.Clear();
+                    text.AddText(value.Value, t => t.Current = current = value);
+                }
+            }
+
+            public TextColumn(LocalisableString title, FontUsage font, float? minWidth = null)
+                : this(title, new OsuTextFlowContainer(t => t.Font = font)
+                {
+                    AutoSizeAxes = Axes.Both
+                }, minWidth)
+            {
+            }
+
+            private TextColumn(LocalisableString title, OsuTextFlowContainer text, float? minWidth = null)
+                : base(title, text, minWidth)
+            {
+                this.text = text;
             }
         }