diff --git a/osu.Game/Overlays/Wiki/WikiPanelContainer.cs b/osu.Game/Overlays/Wiki/WikiPanelContainer.cs
index 64f4d9fbcd..f0fecce8dc 100644
--- a/osu.Game/Overlays/Wiki/WikiPanelContainer.cs
+++ b/osu.Game/Overlays/Wiki/WikiPanelContainer.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using Markdig.Syntax;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
@@ -23,6 +24,8 @@ namespace osu.Game.Overlays.Wiki
         [Resolved]
         private OverlayColourProvider colourProvider { get; set; }
 
+        private WikiPanelMarkdownContainer panelContainer;
+
         public string Text;
 
         public bool IsFullWidth;
@@ -30,7 +33,6 @@ namespace osu.Game.Overlays.Wiki
         public WikiPanelContainer()
         {
             RelativeSizeAxes = Axes.X;
-            AutoSizeAxes = Axes.Y;
             Padding = new MarginPadding(3);
         }
 
@@ -57,7 +59,7 @@ namespace osu.Game.Overlays.Wiki
                         RelativeSizeAxes = Axes.Both,
                     },
                 },
-                new WikiPanelMarkdownContainer
+                panelContainer = new WikiPanelMarkdownContainer
                 {
                     Text = Text,
                     RelativeSizeAxes = Axes.X,
@@ -67,6 +69,12 @@ namespace osu.Game.Overlays.Wiki
             };
         }
 
+        protected override void Update()
+        {
+            base.Update();
+            Height = Math.Max(panelContainer.Height, Parent.DrawHeight);
+        }
+
         private class WikiPanelMarkdownContainer : WikiMarkdownContainer
         {
             public bool IsFullWidth;