diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
index 4c42823779..ca041da801 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
@@ -57,7 +57,13 @@ namespace osu.Game.Storyboards.Drawables
         public DrawableStoryboard(Storyboard storyboard)
         {
             Storyboard = storyboard;
+
             Size = new Vector2(640, 480);
+
+            bool onlyHasVideoElements = Storyboard.Layers.SelectMany(l => l.Elements).Any(e => !(e is StoryboardVideo));
+
+            Width = Height * (storyboard.BeatmapInfo.WidescreenStoryboard || onlyHasVideoElements ? 16 / 9f : 4 / 3f);
+
             Anchor = Anchor.Centre;
             Origin = Anchor.Centre;
 
diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardLayer.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardLayer.cs
index 2ada83c3b4..1085b52d65 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardLayer.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardLayer.cs
@@ -5,6 +5,7 @@ using System.Threading;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osuTK;
 
 namespace osu.Game.Storyboards.Drawables
 {
@@ -15,6 +16,8 @@ namespace osu.Game.Storyboards.Drawables
 
         public override bool IsPresent => Enabled && base.IsPresent;
 
+        protected LayerElementContainer ElementContainer { get; }
+
         public DrawableStoryboardLayer(StoryboardLayer layer)
         {
             Layer = layer;
@@ -24,10 +27,10 @@ namespace osu.Game.Storyboards.Drawables
             Enabled = layer.VisibleWhenPassing;
             Masking = layer.Masking;
 
-            InternalChild = new LayerElementContainer(layer);
+            InternalChild = ElementContainer = new LayerElementContainer(layer);
         }
 
-        private class LayerElementContainer : LifetimeManagementContainer
+        protected class LayerElementContainer : LifetimeManagementContainer
         {
             private readonly StoryboardLayer storyboardLayer;
 
@@ -35,8 +38,8 @@ namespace osu.Game.Storyboards.Drawables
             {
                 storyboardLayer = layer;
 
-                Width = 640;
-                Height = 480;
+                Size = new Vector2(640, 480);
+
                 Anchor = Anchor.Centre;
                 Origin = Anchor.Centre;
             }
diff --git a/osu.Game/Storyboards/Storyboard.cs b/osu.Game/Storyboards/Storyboard.cs
index bc61f704dd..3486c1d66a 100644
--- a/osu.Game/Storyboards/Storyboard.cs
+++ b/osu.Game/Storyboards/Storyboard.cs
@@ -53,7 +53,7 @@ namespace osu.Game.Storyboards
 
         public Storyboard()
         {
-            layers.Add("Video", new StoryboardLayer("Video", 4, false));
+            layers.Add("Video", new StoryboardVideoLayer("Video", 4, false));
             layers.Add("Background", new StoryboardLayer("Background", 3));
             layers.Add("Fail", new StoryboardLayer("Fail", 2) { VisibleWhenPassing = false, });
             layers.Add("Pass", new StoryboardLayer("Pass", 1) { VisibleWhenFailing = false, });
@@ -85,12 +85,8 @@ namespace osu.Game.Storyboards
             }
         }
 
-        public DrawableStoryboard CreateDrawable(WorkingBeatmap working = null)
-        {
-            var drawable = new DrawableStoryboard(this);
-            drawable.Width = drawable.Height * (BeatmapInfo.WidescreenStoryboard ? 16 / 9f : 4 / 3f);
-            return drawable;
-        }
+        public DrawableStoryboard CreateDrawable(WorkingBeatmap working = null) =>
+            new DrawableStoryboard(this);
 
         public Drawable CreateSpriteFromResourcePath(string path, TextureStore textureStore)
         {
diff --git a/osu.Game/Storyboards/StoryboardLayer.cs b/osu.Game/Storyboards/StoryboardLayer.cs
index 1cde7cf67a..fa9d4ebfea 100644
--- a/osu.Game/Storyboards/StoryboardLayer.cs
+++ b/osu.Game/Storyboards/StoryboardLayer.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Storyboards
             Elements.Add(element);
         }
 
-        public DrawableStoryboardLayer CreateDrawable()
+        public virtual DrawableStoryboardLayer CreateDrawable()
             => new DrawableStoryboardLayer(this) { Depth = Depth, Name = Name };
     }
 }
diff --git a/osu.Game/Storyboards/StoryboardVideoLayer.cs b/osu.Game/Storyboards/StoryboardVideoLayer.cs
new file mode 100644
index 0000000000..2a01c2274a
--- /dev/null
+++ b/osu.Game/Storyboards/StoryboardVideoLayer.cs
@@ -0,0 +1,32 @@
+// 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 osu.Framework.Graphics;
+using osu.Game.Storyboards.Drawables;
+using osuTK;
+
+namespace osu.Game.Storyboards
+{
+    public class StoryboardVideoLayer : StoryboardLayer
+    {
+        public StoryboardVideoLayer(string name, int depth, bool masking)
+            : base(name, depth, masking)
+        {
+        }
+
+        public override DrawableStoryboardLayer CreateDrawable()
+            => new DrawableStoryboardVideoLayer(this) { Depth = Depth, Name = Name };
+
+        public class DrawableStoryboardVideoLayer : DrawableStoryboardLayer
+        {
+            public DrawableStoryboardVideoLayer(StoryboardVideoLayer layer)
+                : base(layer)
+            {
+                // for videos we want to take on the full size of the storyboard container hierarchy
+                // to allow the video to fill the full available region.
+                ElementContainer.RelativeSizeAxes = Axes.Both;
+                ElementContainer.Size = Vector2.One;
+            }
+        }
+    }
+}