diff --git a/osu.Game/Screens/Play/EpilepsyWarning.cs b/osu.Game/Screens/Play/EpilepsyWarning.cs
index 051604f115..960d549ab6 100644
--- a/osu.Game/Screens/Play/EpilepsyWarning.cs
+++ b/osu.Game/Screens/Play/EpilepsyWarning.cs
@@ -5,16 +5,14 @@ using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Track;
 using osu.Framework.Bindables;
-using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
+using osu.Game.Screens.Backgrounds;
 using osuTK;
-using osuTK.Graphics;
 
 namespace osu.Game.Screens.Play
 {
@@ -31,16 +29,13 @@ namespace osu.Game.Screens.Play
             Alpha = 0f;
         }
 
+        public BackgroundScreenBeatmap DimmableBackground { get; set; }
+
         [BackgroundDependencyLoader]
         private void load(OsuColour colours, IBindable<WorkingBeatmap> beatmap)
         {
             Children = new Drawable[]
             {
-                new Box
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Colour = Color4.Black.Opacity(0.5f),
-                },
                 warningContent = new FillFlowContainer
                 {
                     Anchor = Anchor.Centre,
@@ -88,10 +83,11 @@ namespace osu.Game.Screens.Play
 
         protected override void PopIn()
         {
-            this.FadeIn(500, Easing.InQuint)
-                .TransformBindableTo(trackVolumeOnEpilepsyWarning, 0.25, 500, Easing.InQuint);
+            this.TransformBindableTo(trackVolumeOnEpilepsyWarning, 0.25, FADE_DURATION);
 
-            warningContent.FadeIn(500, Easing.InQuint);
+            DimmableBackground?.FadeColour(OsuColour.Gray(0.5f), FADE_DURATION, Easing.OutQuint);
+
+            this.FadeIn(FADE_DURATION, Easing.OutQuint);
         }
 
         protected override void PopOut()
diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs
index f68246c928..ef01072a62 100644
--- a/osu.Game/Screens/Play/PlayerLoader.cs
+++ b/osu.Game/Screens/Play/PlayerLoader.cs
@@ -167,6 +167,9 @@ namespace osu.Game.Screens.Play
         {
             base.OnEntering(last);
 
+            if (epilepsyWarning != null)
+                epilepsyWarning.DimmableBackground = Background;
+
             content.ScaleTo(0.7f);
             Background?.FadeColour(Color4.White, 800, Easing.OutQuint);