diff --git a/osu.Game.Rulesets.Taiko.Tests/Editor/TestSceneTaikoEditorTestGameplay.cs b/osu.Game.Rulesets.Taiko.Tests/Editor/TestSceneTaikoEditorTestGameplay.cs
index 2422e62571a1..0a7c2e89bca9 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Editor/TestSceneTaikoEditorTestGameplay.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Editor/TestSceneTaikoEditorTestGameplay.cs
@@ -62,7 +62,7 @@ public void TestBasicGameplayTest()
             });
             AddUntilStep("save prompt shown", () => DialogOverlay.CurrentDialog is SaveRequiredPopupDialog);
 
-            AddStep("save changes", () => DialogOverlay.CurrentDialog!.PerformOkAction());
+            AddStep("save changes", () => (DialogOverlay.CurrentDialog as SaveRequiredPopupDialog)!.PerformOkAction());
             AddUntilStep("player pushed", () => Stack.CurrentScreen is EditorPlayer);
             AddUntilStep("wait for return to editor", () => Stack.CurrentScreen is Screens.Edit.Editor);
         }
diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorBeatmapCreation.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorBeatmapCreation.cs
index ed91fe848ab3..5d008ed278c7 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorBeatmapCreation.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorBeatmapCreation.cs
@@ -165,7 +165,7 @@ public void TestCreateNewDifficulty([Values] bool sameRuleset)
             if (sameRuleset)
             {
                 AddUntilStep("wait for dialog", () => DialogOverlay.CurrentDialog is CreateNewDifficultyDialog);
-                AddStep("confirm creation with no objects", () => DialogOverlay.CurrentDialog!.PerformOkAction());
+                AddStep("confirm creation with no objects", () => (DialogOverlay.CurrentDialog as CreateNewDifficultyDialog)!.PerformOkAction());
             }
 
             AddUntilStep("wait for created", () =>
@@ -240,7 +240,7 @@ public void TestCreateNewDifficultyWithScrollSpeed_SameRuleset()
             AddStep("create new difficulty", () => Editor.CreateNewDifficulty(new ManiaRuleset().RulesetInfo));
 
             AddUntilStep("wait for dialog", () => DialogOverlay.CurrentDialog is CreateNewDifficultyDialog);
-            AddStep("confirm creation with no objects", () => DialogOverlay.CurrentDialog!.PerformOkAction());
+            AddStep("confirm creation with no objects", () => (DialogOverlay.CurrentDialog as CreateNewDifficultyDialog)!.PerformOkAction());
 
             AddUntilStep("wait for created", () =>
             {
@@ -386,7 +386,7 @@ public void TestCopyDifficulty()
             AddStep("create new difficulty", () => Editor.CreateNewDifficulty(new OsuRuleset().RulesetInfo));
 
             AddUntilStep("wait for dialog", () => DialogOverlay.CurrentDialog is CreateNewDifficultyDialog);
-            AddStep("confirm creation as a copy", () => DialogOverlay.CurrentDialog!.Buttons.ElementAt(1).TriggerClick());
+            AddStep("confirm creation as a copy", () => (DialogOverlay.CurrentDialog as CreateNewDifficultyDialog)!.Buttons.ElementAt(1).TriggerClick());
 
             AddUntilStep("wait for created", () =>
             {
@@ -464,7 +464,7 @@ public void TestCopyDifficultyDoesNotChangeCollections()
             AddStep("create new difficulty", () => Editor.CreateNewDifficulty(new OsuRuleset().RulesetInfo));
 
             AddUntilStep("wait for dialog", () => DialogOverlay.CurrentDialog is CreateNewDifficultyDialog);
-            AddStep("confirm creation as a copy", () => DialogOverlay.CurrentDialog!.Buttons.ElementAt(1).TriggerClick());
+            AddStep("confirm creation as a copy", () => (DialogOverlay.CurrentDialog as CreateNewDifficultyDialog)!.Buttons.ElementAt(1).TriggerClick());
 
             AddUntilStep("wait for created", () =>
             {
@@ -504,7 +504,7 @@ public void TestCreateMultipleNewDifficultiesSucceeds()
 
             AddStep("try to create new difficulty", () => Editor.CreateNewDifficulty(new OsuRuleset().RulesetInfo));
             AddUntilStep("wait for dialog", () => DialogOverlay.CurrentDialog is CreateNewDifficultyDialog);
-            AddStep("confirm creation with no objects", () => DialogOverlay.CurrentDialog!.PerformOkAction());
+            AddStep("confirm creation with no objects", () => (DialogOverlay.CurrentDialog as CreateNewDifficultyDialog)!.PerformOkAction());
 
             AddUntilStep("wait for created", () =>
             {
@@ -542,7 +542,7 @@ public void TestSavingBeatmapFailsWithSameNamedDifficulties([Values] bool sameRu
             if (sameRuleset)
             {
                 AddUntilStep("wait for dialog", () => DialogOverlay.CurrentDialog is CreateNewDifficultyDialog);
-                AddStep("confirm creation with no objects", () => DialogOverlay.CurrentDialog!.PerformOkAction());
+                AddStep("confirm creation with no objects", () => (DialogOverlay.CurrentDialog as CreateNewDifficultyDialog)!.PerformOkAction());
             }
 
             AddUntilStep("wait for created", () =>
@@ -608,7 +608,7 @@ public void TestExitBlockedWhenSavingBeatmapWithSameNamedDifficulties()
 
             AddStep("exit", () => Editor.Exit());
             AddUntilStep("wait for dialog", () => DialogOverlay.CurrentDialog is PromptForSaveDialog);
-            AddStep("attempt to save", () => DialogOverlay.CurrentDialog!.PerformOkAction());
+            AddStep("attempt to save", () => (DialogOverlay.CurrentDialog as PromptForSaveDialog)!.PerformOkAction());
             AddAssert("editor is still current", () => Editor.IsCurrentScreen());
         }
 
@@ -799,7 +799,7 @@ private void createNewDifficulty()
             });
 
             AddUntilStep("wait for dialog", () => DialogOverlay.CurrentDialog is CreateNewDifficultyDialog);
-            AddStep("confirm creation with no objects", () => DialogOverlay.CurrentDialog!.PerformOkAction());
+            AddStep("confirm creation with no objects", () => (DialogOverlay.CurrentDialog as CreateNewDifficultyDialog)!.PerformOkAction());
 
             AddUntilStep("wait for created", () =>
             {
diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorTestGameplay.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorTestGameplay.cs
index f65a3e67e85b..bb242d44b83e 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorTestGameplay.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorTestGameplay.cs
@@ -166,7 +166,7 @@ public void TestCancelGameplayTestWithUnsavedChanges()
 
             AddStep("dismiss prompt", () =>
             {
-                var button = DialogOverlay.CurrentDialog!.Buttons.Last();
+                var button = (DialogOverlay.CurrentDialog as SaveRequiredPopupDialog)!.Buttons.Last();
                 InputManager.MoveMouseTo(button);
                 InputManager.Click(MouseButton.Left);
             });
@@ -193,7 +193,7 @@ public void TestSaveChangesBeforeGameplayTest()
             AddUntilStep("save prompt shown", () => DialogOverlay.CurrentDialog is SaveRequiredPopupDialog);
             AddAssert("track stopped", () => !Beatmap.Value.Track.IsRunning);
 
-            AddStep("save changes", () => DialogOverlay.CurrentDialog!.PerformOkAction());
+            AddStep("save changes", () => (DialogOverlay.CurrentDialog as SaveRequiredPopupDialog)!.PerformOkAction());
 
             EditorPlayer editorPlayer = null;
             AddUntilStep("player pushed", () => (editorPlayer = Stack.CurrentScreen as EditorPlayer) != null);
diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneBeatmapEditorNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneBeatmapEditorNavigation.cs
index 09e8253080be..4c0903c1bf70 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneBeatmapEditorNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneBeatmapEditorNavigation.cs
@@ -339,7 +339,7 @@ public void TestCreateNewDifficultyOnNonExistentBeatmap()
             });
             AddAssert("save dialog displayed", () => Game.ChildrenOfType<DialogOverlay>().Single().CurrentDialog is SaveRequiredPopupDialog);
 
-            AddStep("press save", () => Game.ChildrenOfType<DialogOverlay>().Single().CurrentDialog!.PerformOkAction());
+            AddStep("press save", () => (Game.ChildrenOfType<DialogOverlay>().Single().CurrentDialog as SaveRequiredPopupDialog)!.PerformOkAction());
             AddUntilStep("wait for editor", () => Game.ScreenStack.CurrentScreen is Editor editor && editor.IsLoaded);
             AddAssert("editor beatmap uses catch ruleset", () => getEditorBeatmap().BeatmapInfo.Ruleset.ShortName == "fruits");
         }
diff --git a/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
index d0fc66252e5c..4555d4f597dd 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
@@ -13,13 +13,14 @@
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
-using osu.Framework.Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input;
 using osu.Framework.Logging;
 using osu.Framework.Testing;
 using osu.Game.Configuration;
+using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
@@ -40,6 +41,7 @@ namespace osu.Game.Tests.Visual.Online
     public partial class TestSceneChatOverlay : OsuManualInputManagerTestScene
     {
         private TestChatOverlay chatOverlay;
+        private DialogOverlay dialogOverlay;
         private ChannelManager channelManager;
 
         private readonly APIUser testUser = new APIUser { Username = "test user", Id = 5071479 };
@@ -72,11 +74,13 @@ public void SetUp() => Schedule(() =>
                 CachedDependencies = new (Type, object)[]
                 {
                     (typeof(ChannelManager), channelManager = new ChannelManager(API)),
+                    (typeof(IDialogOverlay), dialogOverlay = new DialogOverlay())
                 },
                 Children = new Drawable[]
                 {
                     channelManager,
                     chatOverlay = new TestChatOverlay(),
+                    dialogOverlay,
                 },
             };
         });
@@ -694,7 +698,17 @@ public void TestChatReport()
                 };
             });
 
-            AddStep("Show report popover", () => this.ChildrenOfType<ChatLine>().First().ShowPopover());
+            AddStep("Open context menu", () =>
+            {
+                var username = this.ChildrenOfType<DrawableChatUsername>().First().ChildrenOfType<TruncatingSpriteText>().First();
+                InputManager.MoveMouseTo(username);
+                InputManager.Click(MouseButton.Right);
+            });
+            AddStep("Select report option", () =>
+            {
+                InputManager.MoveMouseTo(this.ChildrenOfType<Menu.DrawableMenuItem>().First(m => m.Item.Text.ToString() == "Report"));
+                InputManager.Click(MouseButton.Left);
+            });
 
             AddStep("Set report reason to other", () =>
             {
@@ -704,26 +718,26 @@ public void TestChatReport()
 
             AddStep("Try to report", () =>
             {
-                var btn = this.ChildrenOfType<ReportChatPopover>().Single().ChildrenOfType<RoundedButton>().Single();
+                var btn = this.ChildrenOfType<ChatReportDialog>().Single().ChildrenOfType<RoundedButton>().Single();
                 InputManager.MoveMouseTo(btn);
                 InputManager.Click(MouseButton.Left);
             });
 
-            AddAssert("Nothing happened", () => this.ChildrenOfType<ReportChatPopover>().Any());
+            AddAssert("Nothing happened", () => this.ChildrenOfType<ChatReportDialog>().Any());
             AddStep("Set report data", () =>
             {
-                var field = this.ChildrenOfType<ReportChatPopover>().Single().ChildrenOfType<OsuTextBox>().First();
+                var field = this.ChildrenOfType<ChatReportDialog>().Single().ChildrenOfType<OsuTextBox>().First();
                 field.Current.Value = "test other";
             });
 
             AddStep("Try to report", () =>
             {
-                var btn = this.ChildrenOfType<ReportChatPopover>().Single().ChildrenOfType<RoundedButton>().Single();
+                var btn = this.ChildrenOfType<ChatReportDialog>().Single().ChildrenOfType<RoundedButton>().Single();
                 InputManager.MoveMouseTo(btn);
                 InputManager.Click(MouseButton.Left);
             });
 
-            AddUntilStep("Overlay closed", () => !this.ChildrenOfType<ReportChatPopover>().Any());
+            AddUntilStep("Overlay closed", () => !this.ChildrenOfType<ChatReportDialog>().Any());
             AddStep("Complete request", () => requestLock.Set());
             AddUntilStep("Request sent", () => request != null);
             AddUntilStep("Info message displayed", () => channelManager.CurrentChannel.Value.Messages.Last(), () => Is.InstanceOf(typeof(InfoMessage)));
diff --git a/osu.Game.Tests/Visual/Online/TestSceneCommentActions.cs b/osu.Game.Tests/Visual/Online/TestSceneCommentActions.cs
index 56b161db2a2a..c16827c7ff1c 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneCommentActions.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneCommentActions.cs
@@ -260,25 +260,25 @@ public void TestReport()
             });
             AddStep("Try to report", () =>
             {
-                var btn = this.ChildrenOfType<ReportCommentPopover>().Single().ChildrenOfType<RoundedButton>().Single();
+                var btn = this.ChildrenOfType<CommentReportDialog>().Single().ChildrenOfType<RoundedButton>().Single();
                 InputManager.MoveMouseTo(btn);
                 InputManager.Click(MouseButton.Left);
             });
             AddWaitStep("Wait", 3);
-            AddAssert("Nothing happened", () => this.ChildrenOfType<ReportCommentPopover>().Any());
+            AddAssert("Nothing happened", () => this.ChildrenOfType<CommentReportDialog>().Any());
             AddStep("Add comment", () =>
             {
-                var field = this.ChildrenOfType<ReportCommentPopover>().Single().ChildrenOfType<OsuTextBox>().First();
+                var field = this.ChildrenOfType<CommentReportDialog>().Single().ChildrenOfType<OsuTextBox>().First();
                 field.Current.Value = report_text;
             });
             AddStep("Try to report", () =>
             {
-                var btn = this.ChildrenOfType<ReportCommentPopover>().Single().ChildrenOfType<RoundedButton>().Single();
+                var btn = this.ChildrenOfType<CommentReportDialog>().Single().ChildrenOfType<RoundedButton>().Single();
                 InputManager.MoveMouseTo(btn);
                 InputManager.Click(MouseButton.Left);
             });
             AddWaitStep("Wait", 3);
-            AddAssert("Overlay closed", () => !this.ChildrenOfType<ReportCommentPopover>().Any());
+            AddAssert("Overlay closed", () => !this.ChildrenOfType<CommentReportDialog>().Any());
             AddAssert("Loading spinner shown", () => targetComment.ChildrenOfType<LoadingSpinner>().Any(d => d.IsPresent));
             AddStep("Complete request", () => requestLock.Set());
             AddUntilStep("Request sent", () => request != null);
diff --git a/osu.Game.Tests/Visual/Online/TestSceneCommentReportButton.cs b/osu.Game.Tests/Visual/Online/TestSceneCommentReportButton.cs
index d2e73b8673aa..5200c6967ab0 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneCommentReportButton.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneCommentReportButton.cs
@@ -1,21 +1,30 @@
 // 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.Extensions;
+using System;
+using System.Linq;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Cursor;
 using osu.Framework.Testing;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
 using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Overlays;
 using osu.Game.Overlays.Comments;
 using osu.Game.Tests.Visual.UserInterface;
 using osuTK;
+using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Online
 {
     public partial class TestSceneCommentReportButton : ThemeComparisonTestScene
     {
+        private DialogOverlay dialogOverlay = null!;
+
+        public TestSceneCommentReportButton()
+            : base(false)
+        {
+        }
+
         [SetUpSteps]
         public void SetUpSteps()
         {
@@ -32,15 +41,27 @@ public void SetUpSteps()
             });
         }
 
-        protected override Drawable CreateContent() => new PopoverContainer
+        protected override Drawable CreateContent() => new DependencyProvidingContainer
         {
             RelativeSizeAxes = Axes.Both,
-            Child = new CommentReportButton(new Comment { User = new APIUser { Username = "Someone" } })
+            CachedDependencies = new (Type, object)[]
             {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                Scale = new Vector2(2f),
-            }.With(b => Schedule(b.ShowPopover)),
-        };
+                (typeof(IDialogOverlay), dialogOverlay = new DialogOverlay()),
+            },
+            Children = new Drawable[]
+            {
+                new CommentReportButton(new Comment { User = new APIUser { Username = "Someone" } })
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Scale = new Vector2(2f),
+                },
+                dialogOverlay,
+            }
+        }.With(c => c.OnLoadComplete += _ =>
+        {
+            InputManager.MoveMouseTo(c.ChildrenOfType<CommentReportButton>().First());
+            InputManager.Click(MouseButton.Left);
+        });
     }
 }
diff --git a/osu.Game.Tests/Visual/Online/TestSceneReportPopover.cs b/osu.Game.Tests/Visual/Online/TestSceneReportDialog.cs
similarity index 68%
rename from osu.Game.Tests/Visual/Online/TestSceneReportPopover.cs
rename to osu.Game.Tests/Visual/Online/TestSceneReportDialog.cs
index e2e90535d02c..cb0e92c3511a 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneReportPopover.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneReportDialog.cs
@@ -4,9 +4,7 @@
 using System.Linq;
 using System.Net.Http;
 using NUnit.Framework;
-using osu.Framework.Extensions;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Testing;
 using osu.Game.Graphics;
@@ -15,26 +13,23 @@
 using osu.Game.Graphics.UserInterfaceV2;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
+using osu.Game.Overlays;
 using osu.Game.Overlays.Chat;
 
 namespace osu.Game.Tests.Visual.Online
 {
-    public partial class TestSceneReportPopover : OsuTestScene
+    public partial class TestSceneReportDialog : OsuTestScene
     {
-        private DummyAPIAccess dummyAPI => (DummyAPIAccess)API;
+        private DialogOverlay dialogOverlay = null!;
 
-        private ReportPopoverContainer popover = null!;
+        private DummyAPIAccess dummyAPI => (DummyAPIAccess)API;
 
         [SetUpSteps]
         public void SetUp()
         {
-            AddStep("create popover", () =>
+            AddStep("create dialog overlay", () =>
             {
-                Child = new PopoverContainer
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Child = popover = new ReportPopoverContainer(),
-                };
+                Child = dialogOverlay = new DialogOverlay();
             });
         }
 
@@ -56,16 +51,23 @@ public void TestSuccess()
                     return false;
                 };
             });
-            AddStep("show popover", () => popover.ShowPopover());
+            AddStep("push dialog", () => dialogOverlay.Push(new TestReportDialog("test")));
+
+            AddStep("try to report", () => dialogOverlay.CurrentDialog.ChildrenOfType<Button>().First().TriggerClick());
+            AddWaitStep("wait", 3);
+            AddAssert("nothing happened", () => this.ChildrenOfType<TestReportDialog>().Any(), () => Is.True);
+
             AddStep("input reason", () => this.ChildrenOfType<OsuTextBox>().First().Text = "reason");
             AddStep("send report", () => this.ChildrenOfType<Button>().First().TriggerClick());
-            AddUntilStep("wait for loading layer to hide", () => this.ChildrenOfType<LoadingLayer>().First().IsPresent, () => Is.True);
+
+            AddUntilStep("wait for loading layer to show", () => this.ChildrenOfType<LoadingLayer>().First().IsPresent, () => Is.True);
             AddWaitStep("wait some", 3);
             AddStep("complete request", () => pendingRequest.TriggerSuccess());
             AddUntilStep("wait for loading layer to hide", () => this.ChildrenOfType<LoadingLayer>().First().IsPresent, () => Is.False);
+
             AddAssert("ensure form is not present", () => this.ChildrenOfType<ReverseChildIDFillFlowContainer<Drawable>>().First().IsPresent, () => Is.False);
-            AddAssert("ensure confirmation is present", () => this.ChildrenOfType<ReportPopover<ChatReportReason>.ReportConfirmation>().First().IsPresent, () => Is.True);
-            AddUntilStep("wait for popover to hide", () => this.ChildrenOfType<ReportPopoverContainer.TestReportPopover>().First().IsPresent, () => Is.False);
+            AddAssert("ensure confirmation is present", () => this.ChildrenOfType<ReportDialog<ChatReportReason>.ReportConfirmation>().First().IsPresent, () => Is.True);
+            AddUntilStep("wait for dialog to hide", () => this.ChildrenOfType<TestReportDialog>().Any(), () => Is.False);
         }
 
         [Test]
@@ -86,33 +88,29 @@ public void TestFailure()
                     return false;
                 };
             });
-            AddStep("show popover", () => popover.ShowPopover());
+            AddStep("push dialog", () => dialogOverlay.Push(new TestReportDialog("test")));
+
             AddStep("input reason", () => this.ChildrenOfType<OsuTextBox>().First().Text = "reason");
             AddStep("send report", () => this.ChildrenOfType<Button>().First().TriggerClick());
-            AddUntilStep("wait for loading layer to hide", () => this.ChildrenOfType<LoadingLayer>().First().IsPresent, () => Is.True);
+
+            AddUntilStep("wait for loading layer to show", () => this.ChildrenOfType<LoadingLayer>().First().IsPresent, () => Is.True);
             AddWaitStep("wait some", 3);
             AddStep("fail request", () => pendingRequest.TriggerFailure(new APIException("test error", new HttpRequestException("test error"))));
             AddUntilStep("wait for loading layer to hide", () => this.ChildrenOfType<LoadingLayer>().First().IsPresent, () => Is.False);
+
             AddAssert("ensure form is present", () => this.ChildrenOfType<ReverseChildIDFillFlowContainer<Drawable>>().First().IsPresent, () => Is.True);
             AddAssert("ensure error is present", () => this.ChildrenOfType<ErrorTextFlowContainer>().First().IsPresent, () => Is.True);
-            AddAssert("ensure confirmation is not present", () => this.ChildrenOfType<ReportPopover<ChatReportReason>.ReportConfirmation>().First().IsPresent, () => Is.False);
+            AddAssert("ensure confirmation is not present", () => this.ChildrenOfType<ReportDialog<ChatReportReason>.ReportConfirmation>().First().IsPresent, () => Is.False);
         }
 
-        protected partial class ReportPopoverContainer : Drawable, IHasPopover
+        public partial class TestReportDialog : ReportDialog<ChatReportReason>
         {
-            public Popover GetPopover() => new TestReportPopover("test");
-
-            public partial class TestReportPopover : ReportPopover<ChatReportReason>
+            public TestReportDialog(string name)
+                : base($"Report {name}?")
             {
-                private IAPIProvider api { get; set; } = null!;
-
-                public TestReportPopover(string name)
-                    : base($"Report {name}?")
-                {
-                }
-
-                protected override APIRequest GetRequest(ChatReportReason reason, string comment) => new ChatReportRequest(1, reason, comment);
             }
+
+            protected override APIRequest GetRequest(ChatReportReason reason, string comment) => new ChatReportRequest(1, reason, comment);
         }
     }
 }
diff --git a/osu.Game.Tests/Visual/RankedPlay/TestSceneUserReport.cs b/osu.Game.Tests/Visual/RankedPlay/TestSceneUserReport.cs
new file mode 100644
index 000000000000..2f10f6b7da6d
--- /dev/null
+++ b/osu.Game.Tests/Visual/RankedPlay/TestSceneUserReport.cs
@@ -0,0 +1,76 @@
+// 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.Linq;
+using NUnit.Framework;
+using osu.Framework.Extensions;
+using osu.Framework.Graphics.UserInterface;
+using osu.Framework.Testing;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Graphics.UserInterfaceV2;
+using osu.Game.Online.API;
+using osu.Game.Online.API.Requests;
+using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Multiplayer.MatchTypes.RankedPlay;
+using osu.Game.Online.Rooms;
+using osu.Game.Overlays.Profile;
+using osu.Game.Screens.OnlinePlay.Matchmaking.RankedPlay;
+using osuTK.Input;
+
+namespace osu.Game.Tests.Visual.RankedPlay
+{
+    public partial class TestSceneUserReport : RankedPlayTestScene
+    {
+        private RankedPlayScreen screen = null!;
+        private UserReportDialog dialog = null!;
+
+        private DummyAPIAccess dummyAPI => (DummyAPIAccess)API;
+
+        public override void SetUpSteps()
+        {
+            base.SetUpSteps();
+
+            UserReportRequest pendingRequest = null!;
+
+            AddStep("setup request handling", () =>
+            {
+                dummyAPI.HandleRequest += request =>
+                {
+                    if (request is UserReportRequest chatReportRequest)
+                    {
+                        pendingRequest = chatReportRequest;
+                        return true;
+                    }
+
+                    return false;
+                };
+            });
+
+            AddStep("join room", () => JoinRoom(CreateDefaultRoom(MatchType.RankedPlay)));
+            WaitForJoined();
+
+            AddStep("add other user", () => MultiplayerClient.AddUser(new MultiplayerRoomUser(2)));
+
+            AddStep("load screen", () => LoadScreen(screen = new RankedPlayScreen(MultiplayerClient.ClientRoom!)));
+            AddUntilStep("screen loaded", () => screen.IsLoaded);
+            AddStep("set pick state", () => MultiplayerClient.RankedPlayChangeStage(RankedPlayStage.CardPlay, state => state.ActiveUserId = API.LocalUser.Value.OnlineID).WaitSafely());
+
+            AddStep("open hamburger menu", () => this.ChildrenOfType<HamburgerMenu>().Single().TriggerClick());
+            AddStep("select report option", () =>
+            {
+                var text = this.ChildrenOfType<OsuPopover>().Single().ChildrenOfType<OsuSpriteText>().Single(t => t.Text == "Report opponent");
+                InputManager.MoveMouseTo(text);
+                InputManager.Click(MouseButton.Left);
+            });
+            AddAssert("report dialog is present", () => (dialog = this.ChildrenOfType<UserReportDialog>().Single()).IsPresent, () => Is.True);
+
+            AddStep("input reason", () => dialog.ChildrenOfType<OsuTextBox>().First().Text = "reason");
+            AddStep("send report", () => dialog.ChildrenOfType<Button>().First().TriggerClick());
+
+            AddWaitStep("wait", 5);
+            AddStep("complete request", () => pendingRequest.TriggerSuccess());
+            AddUntilStep("wait for dialog to hide", () => this.ChildrenOfType<UserReportDialog>().Any(), () => Is.False);
+        }
+    }
+}
diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneSongSelect.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneSongSelect.cs
index 24f3255b17cb..03659d1a7e5a 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneSongSelect.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneSongSelect.cs
@@ -164,7 +164,7 @@ public void TestDeleteHotkey()
             });
 
             AddUntilStep("delete dialog shown", () => DialogOverlay.CurrentDialog, Is.InstanceOf<BeatmapDeleteDialog>);
-            AddStep("confirm deletion", () => DialogOverlay.CurrentDialog!.PerformAction<PopupDialogDangerousButton>());
+            AddStep("confirm deletion", () => (DialogOverlay.CurrentDialog as BeatmapDeleteDialog)!.PerformAction<PopupDialogDangerousButton>());
 
             AddAssert("beatmap set deleted", () => Beatmaps.GetAllUsableBeatmapSets().Any(), () => Is.False);
         }
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneDialogOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneDialogOverlay.cs
index f2313022ec4b..f36d5a3f81c7 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneDialogOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneDialogOverlay.cs
@@ -119,7 +119,7 @@ public void TestTooMuchText()
         [Test]
         public void TestPushBeforeLoad()
         {
-            PopupDialog dialog = null;
+            ButtonPopupDialog dialog = null;
 
             AddStep("create slow loading dialog overlay", () => overlay = new SlowLoadingDialogOverlay());
 
@@ -191,7 +191,7 @@ public void TestDismissBeforePushViaButtonPress()
             AddUntilStep("dialog is not part of hierarchy", () => testDialog.Parent == null);
         }
 
-        private partial class TestPopupDialog : PopupDialog
+        private partial class TestPopupDialog : ButtonPopupDialog
         {
         }
     }
diff --git a/osu.Game.Tests/Visual/UserInterface/TestScenePopupDialog.cs b/osu.Game.Tests/Visual/UserInterface/TestScenePopupDialog.cs
index 96d19911bd4b..8e4abdff4370 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestScenePopupDialog.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestScenePopupDialog.cs
@@ -50,7 +50,7 @@ public void TestDangerousButton([Values(false, true)] bool atEdge)
             AddStep("release button", () => InputManager.ReleaseButton(MouseButton.Left));
         }
 
-        private partial class TestPopupDialog : PopupDialog
+        private partial class TestPopupDialog : ButtonPopupDialog
         {
             public PopupDialogDangerousButton DangerousButton { get; }
 
diff --git a/osu.Game.Tournament/Components/IPCErrorDialog.cs b/osu.Game.Tournament/Components/IPCErrorDialog.cs
index 07aeb65ee661..af200c15e09d 100644
--- a/osu.Game.Tournament/Components/IPCErrorDialog.cs
+++ b/osu.Game.Tournament/Components/IPCErrorDialog.cs
@@ -6,7 +6,7 @@
 
 namespace osu.Game.Tournament.Components
 {
-    public partial class IPCErrorDialog : PopupDialog
+    public partial class IPCErrorDialog : ButtonPopupDialog
     {
         public IPCErrorDialog(string headerText, string bodyText)
         {
diff --git a/osu.Game/Graphics/UserInterfaceV2/ReportDialog.cs b/osu.Game/Graphics/UserInterfaceV2/ReportDialog.cs
new file mode 100644
index 000000000000..f85364e24c74
--- /dev/null
+++ b/osu.Game/Graphics/UserInterfaceV2/ReportDialog.cs
@@ -0,0 +1,294 @@
+// 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 osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Localisation;
+using osu.Game.Graphics.Containers;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Online.API;
+using osu.Game.Overlays;
+using osu.Game.Overlays.Dialog;
+using osu.Game.Resources.Localisation.Web;
+using osuTK;
+
+namespace osu.Game.Graphics.UserInterfaceV2
+{
+    /// <summary>
+    /// A generic popup dialog for sending an online report about something.
+    /// </summary>
+    /// <typeparam name="TReportReason">An enumeration type with all valid reasons for the report.</typeparam>
+    public abstract partial class ReportDialog<TReportReason> : PopupDialog
+        where TReportReason : struct, Enum
+    {
+        [Cached]
+        private readonly OverlayColourProvider colourProvider;
+
+        [Resolved]
+        private IAPIProvider api { get; set; } = null!;
+
+        /// <summary>
+        /// The action to run when the report is submitted.
+        /// </summary>
+        public event Action? Submitted;
+
+        /// <summary>
+        /// The action to run when the report is submitted successfully.
+        /// </summary>
+        public event Action? Success;
+
+        /// <summary>
+        /// The action to run when the report failed to submit.
+        /// </summary>
+        public event Action? Failure;
+
+        private Container container = null!;
+
+        private ReverseChildIDFillFlowContainer<Drawable> form = null!;
+        private ReportConfirmation confirmation = null!;
+        private OsuEnumDropdown<TReportReason> reasonDropdown = null!;
+        private OsuTextBox commentsTextBox = null!;
+        private ErrorTextFlowContainer errorMessage = null!;
+        private RoundedButton submitButton = null!;
+        private LoadingLayer loadingLayer = null!;
+
+        private readonly LocalisableString header;
+
+        private readonly bool showConfirmation;
+
+        /// <summary>
+        /// Creates a new <see cref="ReportDialog{TReportReason}"/>.
+        /// </summary>
+        /// <param name="headerString">The text to display in the header of the dialog.</param>
+        /// <param name="showConfirmation">
+        /// Whether the dialog should show a generic "Thank you for your report" confirmation message.
+        /// Set this to `false` if you're displaying a custom message outside of this dialog.
+        /// </param>
+        /// <param name="colourProvider">The colour provider to be used by this dialog.</param>
+        protected ReportDialog(LocalisableString headerString, bool showConfirmation = true, OverlayColourProvider? colourProvider = null)
+        {
+            header = headerString;
+            this.showConfirmation = showConfirmation;
+
+            // We inject the colour provider manually instead of relying on DI, because it's going
+            // to be pushed to a `DialogOverlay` which will have a different dependency container
+            // than the overlay/screen this dialog is related to.
+            this.colourProvider = colourProvider ?? new OverlayColourProvider(OverlayColourScheme.Plum);
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            Width = 540;
+
+            Child = new Container
+            {
+                RelativeSizeAxes = Axes.X,
+                AutoSizeAxes = Axes.Y,
+                Children = new Drawable[]
+                {
+                    new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Colour = colourProvider.Background4,
+                    },
+                    container = new Container
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        AutoSizeAxes = Axes.Y,
+                        Children = new Drawable[]
+                        {
+                            form = new ReverseChildIDFillFlowContainer<Drawable>
+                            {
+                                Direction = FillDirection.Vertical,
+                                RelativeSizeAxes = Axes.X,
+                                AutoSizeAxes = Axes.Y,
+                                Spacing = new Vector2(7),
+                                Padding = new MarginPadding(20),
+                                Children = new Drawable[]
+                                {
+                                    new SpriteIcon
+                                    {
+                                        Origin = Anchor.TopCentre,
+                                        Anchor = Anchor.TopCentre,
+                                        Icon = FontAwesome.Solid.ExclamationTriangle,
+                                        Size = new Vector2(36),
+                                    },
+                                    new OsuSpriteText
+                                    {
+                                        Origin = Anchor.TopCentre,
+                                        Anchor = Anchor.TopCentre,
+                                        Text = header,
+                                        Font = OsuFont.Torus.With(size: 25),
+                                        Margin = new MarginPadding { Bottom = 10 }
+                                    },
+                                    new OsuSpriteText
+                                    {
+                                        Origin = Anchor.TopCentre,
+                                        Anchor = Anchor.TopCentre,
+                                        Text = UsersStrings.ReportReason,
+                                    },
+                                    new Container
+                                    {
+                                        RelativeSizeAxes = Axes.X,
+                                        Height = 40,
+                                        Child = reasonDropdown = new OsuEnumDropdown<TReportReason>
+                                        {
+                                            RelativeSizeAxes = Axes.X
+                                        }
+                                    },
+                                    new OsuSpriteText
+                                    {
+                                        Origin = Anchor.TopCentre,
+                                        Anchor = Anchor.TopCentre,
+                                        Text = UsersStrings.ReportComments,
+                                    },
+                                    commentsTextBox = new OsuTextBox
+                                    {
+                                        RelativeSizeAxes = Axes.X,
+                                        PlaceholderText = UsersStrings.ReportPlaceholder,
+                                    },
+                                    errorMessage = new ErrorTextFlowContainer
+                                    {
+                                        RelativeSizeAxes = Axes.X,
+                                        AutoSizeAxes = Axes.Y,
+                                    },
+                                    submitButton = new RoundedButton
+                                    {
+                                        Origin = Anchor.TopCentre,
+                                        Anchor = Anchor.TopCentre,
+                                        Width = 200,
+                                        BackgroundColour = colours.Red3,
+                                        Text = UsersStrings.ReportActionsSend,
+                                        Action = () =>
+                                        {
+                                            if (showConfirmation)
+                                                loadingLayer.Show();
+
+                                            // we don't want size easing to mess up any transforms that are happening
+                                            // when the dialog is appearing, hence easing is only enabled after
+                                            // the report is submitted
+                                            container.AutoSizeEasing = Easing.OutQuint;
+                                            container.AutoSizeDuration = 500F;
+
+                                            Submitted?.Invoke();
+                                            performRequest();
+
+                                            if (!showConfirmation)
+                                                Hide();
+                                        },
+                                        Margin = new MarginPadding { Bottom = 5, Top = 10 },
+                                    },
+                                },
+                            },
+                            confirmation = new ReportConfirmation(),
+                            loadingLayer = new LoadingLayer(true)
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                            },
+                        },
+                    },
+                },
+            };
+
+            commentsTextBox.Current.BindValueChanged(_ => updateStatus());
+
+            reasonDropdown.Current.BindValueChanged(_ => updateStatus());
+
+            updateStatus();
+        }
+
+        private void performRequest()
+        {
+            var request = GetRequest(reasonDropdown.Current.Value, commentsTextBox.Text);
+
+            request.Success += handleSuccess;
+            request.Failure += handleFailure;
+
+            api.Queue(request);
+        }
+
+        private void handleSuccess()
+        {
+            if (showConfirmation)
+            {
+                Schedule(() =>
+                {
+                    form.Hide();
+                    confirmation.Show();
+
+                    loadingLayer.Hide();
+                    Scheduler.AddDelayed(Hide, 2000);
+                });
+            }
+
+            Success?.Invoke();
+        }
+
+        private void handleFailure(Exception e)
+        {
+            if (showConfirmation)
+            {
+                Schedule(() => errorMessage.AddErrors([e.Message]));
+                loadingLayer.Hide();
+            }
+
+            Failure?.Invoke();
+        }
+
+        private void updateStatus()
+        {
+            submitButton.Enabled.Value = !string.IsNullOrWhiteSpace(commentsTextBox.Current.Value) || !IsCommentRequired(reasonDropdown.Current.Value);
+        }
+
+        /// <summary>
+        /// Returns the API request responsible for submitting this report.
+        /// </summary>
+        /// <param name="reason">The reason for this report.</param>
+        /// <param name="comments">An optional comment explaining the report.</param>
+        /// <returns></returns>
+        protected abstract APIRequest GetRequest(TReportReason reason, string comments);
+
+        /// <summary>
+        /// Determines whether an additional comment is required for submitting the report with the supplied <paramref name="reason"/>.
+        /// </summary>
+        protected virtual bool IsCommentRequired(TReportReason reason) => true;
+
+        public partial class ReportConfirmation : FillFlowContainer
+        {
+            public ReportConfirmation()
+            {
+                Direction = FillDirection.Vertical;
+                RelativeSizeAxes = Axes.X;
+                AutoSizeAxes = Axes.Y;
+                Spacing = new Vector2(7);
+                Padding = new MarginPadding(20);
+                Alpha = 0;
+
+                Children = new Drawable[]
+                {
+                    new SpriteIcon
+                    {
+                        Origin = Anchor.TopCentre,
+                        Anchor = Anchor.TopCentre,
+                        Icon = FontAwesome.Solid.ExclamationTriangle,
+                        Size = new Vector2(36),
+                    },
+                    new OsuSpriteText
+                    {
+                        Origin = Anchor.TopCentre,
+                        Anchor = Anchor.TopCentre,
+                        Text = UsersStrings.ReportThanks,
+                        Font = OsuFont.Torus.With(size: 25),
+                        Margin = new MarginPadding { Bottom = 10 }
+                    },
+                };
+            }
+        }
+    }
+}
diff --git a/osu.Game/Graphics/UserInterfaceV2/ReportPopover.cs b/osu.Game/Graphics/UserInterfaceV2/ReportPopover.cs
deleted file mode 100644
index a7b6aad18852..000000000000
--- a/osu.Game/Graphics/UserInterfaceV2/ReportPopover.cs
+++ /dev/null
@@ -1,265 +0,0 @@
-// 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 osu.Framework.Allocation;
-using osu.Framework.Extensions;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Sprites;
-using osu.Framework.Localisation;
-using osu.Game.Graphics.Containers;
-using osu.Game.Graphics.Sprites;
-using osu.Game.Graphics.UserInterface;
-using osu.Game.Online.API;
-using osu.Game.Resources.Localisation.Web;
-using osuTK;
-
-namespace osu.Game.Graphics.UserInterfaceV2
-{
-    /// <summary>
-    /// A generic popover for sending an online report about something.
-    /// </summary>
-    /// <typeparam name="TReportReason">An enumeration type with all valid reasons for the report.</typeparam>
-    public abstract partial class ReportPopover<TReportReason> : OsuPopover
-        where TReportReason : struct, Enum
-    {
-        [Resolved]
-        private IAPIProvider api { get; set; } = null!;
-
-        /// <summary>
-        /// The action to run when the report is submitted.
-        /// </summary>
-        public event Action? Submitted;
-
-        /// <summary>
-        /// The action to run when the report is submitted successfully.
-        /// </summary>
-        public event Action? Success;
-
-        /// <summary>
-        /// The action to run when the report failed to submit.
-        /// </summary>
-        public event Action? Failure;
-
-        private ReverseChildIDFillFlowContainer<Drawable> form = null!;
-        private ReportConfirmation confirmation = null!;
-        private OsuEnumDropdown<TReportReason> reasonDropdown = null!;
-        private OsuTextBox commentsTextBox = null!;
-        private ErrorTextFlowContainer errorMessage = null!;
-        private RoundedButton submitButton = null!;
-        private LoadingLayer loadingLayer = null!;
-
-        private readonly LocalisableString header;
-
-        private readonly bool showConfirmation;
-
-        /// <summary>
-        /// Creates a new <see cref="ReportPopover{TReportReason}"/>.
-        /// </summary>
-        /// <param name="headerString">The text to display in the header of the popover.</param>
-        /// <param name="showConfirmation">
-        /// Whether the popover should show a generic "Thank you for your report" confirmation message.
-        /// Set this to `true` if you're displaying a custom message outside of this popover.
-        /// </param>
-        protected ReportPopover(LocalisableString headerString, bool showConfirmation = true)
-            : base(false)
-        {
-            header = headerString;
-            this.showConfirmation = showConfirmation;
-        }
-
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
-        {
-            Content.AutoSizeAxes = Axes.Y;
-            Content.Width = 500;
-
-            Children = new Drawable[]
-            {
-                form = new ReverseChildIDFillFlowContainer<Drawable>
-                {
-                    Direction = FillDirection.Vertical,
-                    RelativeSizeAxes = Axes.X,
-                    AutoSizeAxes = Axes.Y,
-                    Spacing = new Vector2(7),
-                    Padding = new MarginPadding(20),
-                    Children = new Drawable[]
-                    {
-                        new SpriteIcon
-                        {
-                            Origin = Anchor.TopCentre,
-                            Anchor = Anchor.TopCentre,
-                            Icon = FontAwesome.Solid.ExclamationTriangle,
-                            Size = new Vector2(36),
-                        },
-                        new OsuSpriteText
-                        {
-                            Origin = Anchor.TopCentre,
-                            Anchor = Anchor.TopCentre,
-                            Text = header,
-                            Font = OsuFont.Torus.With(size: 25),
-                            Margin = new MarginPadding { Bottom = 10 }
-                        },
-                        new OsuSpriteText
-                        {
-                            Origin = Anchor.TopCentre,
-                            Anchor = Anchor.TopCentre,
-                            Text = UsersStrings.ReportReason,
-                        },
-                        new Container
-                        {
-                            RelativeSizeAxes = Axes.X,
-                            Height = 40,
-                            Child = reasonDropdown = new OsuEnumDropdown<TReportReason>
-                            {
-                                RelativeSizeAxes = Axes.X
-                            }
-                        },
-                        new OsuSpriteText
-                        {
-                            Origin = Anchor.TopCentre,
-                            Anchor = Anchor.TopCentre,
-                            Text = UsersStrings.ReportComments,
-                        },
-                        commentsTextBox = new OsuTextBox
-                        {
-                            RelativeSizeAxes = Axes.X,
-                            PlaceholderText = UsersStrings.ReportPlaceholder,
-                        },
-                        errorMessage = new ErrorTextFlowContainer
-                        {
-                            RelativeSizeAxes = Axes.X,
-                            AutoSizeAxes = Axes.Y,
-                        },
-                        submitButton = new RoundedButton
-                        {
-                            Origin = Anchor.TopCentre,
-                            Anchor = Anchor.TopCentre,
-                            Width = 200,
-                            BackgroundColour = colours.Red3,
-                            Text = UsersStrings.ReportActionsSend,
-                            Action = () =>
-                            {
-                                if (showConfirmation)
-                                    loadingLayer.Show();
-
-                                // we don't want size easing to mess up any transforms that are happening
-                                // when the popover is appearing, hence easing is only enabled after
-                                // the report is submitted
-                                Content.AutoSizeEasing = Easing.OutQuint;
-                                Content.AutoSizeDuration = 500F;
-
-                                Submitted?.Invoke();
-                                performRequest();
-
-                                if (!showConfirmation)
-                                    this.HidePopover();
-                            },
-                            Margin = new MarginPadding { Bottom = 5, Top = 10 },
-                        },
-                    },
-                },
-                confirmation = new ReportConfirmation(),
-                loadingLayer = new LoadingLayer(true)
-                {
-                    RelativeSizeAxes = Axes.Both,
-                },
-            };
-
-            commentsTextBox.Current.BindValueChanged(_ => updateStatus());
-
-            reasonDropdown.Current.BindValueChanged(_ => updateStatus());
-
-            updateStatus();
-        }
-
-        private void performRequest()
-        {
-            var request = GetRequest(reasonDropdown.Current.Value, commentsTextBox.Text);
-
-            request.Success += handleSuccess;
-            request.Failure += handleFailure;
-
-            api.Queue(request);
-        }
-
-        private void handleSuccess()
-        {
-            if (showConfirmation)
-            {
-                Schedule(() =>
-                {
-                    form.Hide();
-                    confirmation.Show();
-
-                    loadingLayer.Hide();
-                    Scheduler.AddDelayed(this.HidePopover, 2000);
-                });
-            }
-
-            Success?.Invoke();
-        }
-
-        private void handleFailure(Exception e)
-        {
-            if (showConfirmation)
-            {
-                Schedule(() => errorMessage.AddErrors([e.Message]));
-                loadingLayer.Hide();
-            }
-
-            Failure?.Invoke();
-        }
-
-        private void updateStatus()
-        {
-            submitButton.Enabled.Value = !string.IsNullOrWhiteSpace(commentsTextBox.Current.Value) || !IsCommentRequired(reasonDropdown.Current.Value);
-        }
-
-        /// <summary>
-        /// Returns the API request responsible for submitting this report.
-        /// </summary>
-        /// <param name="reason">The reason for this report.</param>
-        /// <param name="comments">An optional comment explaining the report.</param>
-        /// <returns></returns>
-        protected abstract APIRequest GetRequest(TReportReason reason, string comments);
-
-        /// <summary>
-        /// Determines whether an additional comment is required for submitting the report with the supplied <paramref name="reason"/>.
-        /// </summary>
-        protected virtual bool IsCommentRequired(TReportReason reason) => true;
-
-        public partial class ReportConfirmation : FillFlowContainer
-        {
-            public ReportConfirmation()
-            {
-                Direction = FillDirection.Vertical;
-                RelativeSizeAxes = Axes.X;
-                AutoSizeAxes = Axes.Y;
-                Spacing = new Vector2(7);
-                Padding = new MarginPadding(20);
-                Alpha = 0;
-
-                Children = new Drawable[]
-                {
-                    new SpriteIcon
-                    {
-                        Origin = Anchor.TopCentre,
-                        Anchor = Anchor.TopCentre,
-                        Icon = FontAwesome.Solid.ExclamationTriangle,
-                        Size = new Vector2(36),
-                    },
-                    new OsuSpriteText
-                    {
-                        Origin = Anchor.TopCentre,
-                        Anchor = Anchor.TopCentre,
-                        Text = UsersStrings.ReportThanks,
-                        Font = OsuFont.Torus.With(size: 25),
-                        Margin = new MarginPadding { Bottom = 10 }
-                    },
-                };
-            }
-        }
-    }
-}
diff --git a/osu.Game/Online/Chat/ExternalLinkOpener.cs b/osu.Game/Online/Chat/ExternalLinkOpener.cs
index 708e9edefa17..9ddd62be27b7 100644
--- a/osu.Game/Online/Chat/ExternalLinkOpener.cs
+++ b/osu.Game/Online/Chat/ExternalLinkOpener.cs
@@ -93,7 +93,7 @@ public void OpenUrlExternally(string url, LinkWarnMode warnMode = LinkWarnMode.D
                 host.OpenUrlExternally(url);
         }
 
-        public partial class ExternalLinkDialog : PopupDialog
+        public partial class ExternalLinkDialog : ButtonPopupDialog
         {
             public ExternalLinkDialog(string url, Action openExternalLinkAction, Action copyExternalLinkAction)
             {
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapSearchGeneralFilterRow.cs b/osu.Game/Overlays/BeatmapListing/BeatmapSearchGeneralFilterRow.cs
index b62836dfde35..c2abcac60260 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapSearchGeneralFilterRow.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapSearchGeneralFilterRow.cs
@@ -182,7 +182,7 @@ protected override bool OnClick(ClickEvent e)
         }
     }
 
-    internal partial class FeaturedArtistConfirmDialog : PopupDialog
+    internal partial class FeaturedArtistConfirmDialog : ButtonPopupDialog
     {
         public FeaturedArtistConfirmDialog(Action confirm)
         {
diff --git a/osu.Game/Overlays/Chat/ChatLine.cs b/osu.Game/Overlays/Chat/ChatLine.cs
index 427d874f121a..4a2bbd92af29 100644
--- a/osu.Game/Overlays/Chat/ChatLine.cs
+++ b/osu.Game/Overlays/Chat/ChatLine.cs
@@ -5,15 +5,12 @@
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
-using osu.Framework.Extensions;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Extensions.LocalisationExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
-using osu.Framework.Graphics.UserInterface;
 using osu.Game.Configuration;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
@@ -26,7 +23,7 @@
 
 namespace osu.Game.Overlays.Chat
 {
-    public partial class ChatLine : CompositeDrawable, IHasPopover
+    public partial class ChatLine : CompositeDrawable
     {
         private Message message = null!;
 
@@ -60,6 +57,9 @@ public Message Message
         [Resolved]
         private OverlayColourProvider? colourProvider { get; set; }
 
+        [Resolved]
+        private IDialogOverlay? dialogOverlay { get; set; }
+
         private OsuSpriteText drawableTimestamp = null!;
 
         private DrawableChatUsername drawableUsername = null!;
@@ -219,20 +219,9 @@ protected override void LoadComplete()
             updateMessageContent();
             FinishTransforms(true);
 
-            if (this.FindClosestParent<PopoverContainer>() != null)
-            {
-                // This guards against cases like in-game chat where there's no available popover container.
-                // There may be a future where a global one becomes available, at which point this code may be unnecessary.
-                //
-                // See:
-                // https://github.com/ppy/osu/pull/23698
-                // https://github.com/ppy/osu/pull/14554
-                drawableUsername.ReportRequested = this.ShowPopover;
-            }
+            drawableUsername.ReportRequested = () => dialogOverlay?.Push(new ChatReportDialog(message, colourProvider));
         }
 
-        public Popover GetPopover() => new ReportChatPopover(message);
-
         /// <summary>
         /// Performs a highlight animation on this <see cref="ChatLine"/>.
         /// </summary>
diff --git a/osu.Game/Overlays/Chat/ReportChatPopover.cs b/osu.Game/Overlays/Chat/ChatReportDialog.cs
similarity index 91%
rename from osu.Game/Overlays/Chat/ReportChatPopover.cs
rename to osu.Game/Overlays/Chat/ChatReportDialog.cs
index 5a209fec5915..8d576d556cb5 100644
--- a/osu.Game/Overlays/Chat/ReportChatPopover.cs
+++ b/osu.Game/Overlays/Chat/ChatReportDialog.cs
@@ -10,15 +10,15 @@
 
 namespace osu.Game.Overlays.Chat
 {
-    public partial class ReportChatPopover : ReportPopover<ChatReportReason>
+    public partial class ChatReportDialog : ReportDialog<ChatReportReason>
     {
         [Resolved]
         private ChannelManager channelManager { get; set; } = null!;
 
         private readonly Message message;
 
-        public ReportChatPopover(Message message)
-            : base(ReportStrings.UserTitle(message.Sender?.Username ?? @"Someone"), false)
+        public ChatReportDialog(Message message, OverlayColourProvider? colourProvider = null)
+            : base(ReportStrings.UserTitle(message.Sender?.Username ?? @"Someone"), false, colourProvider)
         {
             this.message = message;
         }
diff --git a/osu.Game/Overlays/Comments/CommentReportButton.cs b/osu.Game/Overlays/Comments/CommentReportButton.cs
index 8303a13e5ce9..5e1494791207 100644
--- a/osu.Game/Overlays/Comments/CommentReportButton.cs
+++ b/osu.Game/Overlays/Comments/CommentReportButton.cs
@@ -3,13 +3,10 @@
 
 using System.Linq;
 using osu.Framework.Allocation;
-using osu.Framework.Extensions;
 using osu.Framework.Extensions.LocalisationExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.Sprites;
-using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Testing;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
@@ -20,7 +17,7 @@
 
 namespace osu.Game.Overlays.Comments
 {
-    public partial class CommentReportButton : CompositeDrawable, IHasPopover, IHasLineBaseHeight
+    public partial class CommentReportButton : CompositeDrawable, IHasLineBaseHeight
     {
         private readonly Comment comment;
 
@@ -30,6 +27,9 @@ public partial class CommentReportButton : CompositeDrawable, IHasPopover, IHasL
         [Resolved]
         private OverlayColourProvider? colourProvider { get; set; }
 
+        [Resolved]
+        private IDialogOverlay? dialogOverlay { get; set; }
+
         public CommentReportButton(Comment comment)
         {
             this.comment = comment;
@@ -52,20 +52,20 @@ private void load()
                 }
             };
 
-            link.AddLink(ReportStrings.CommentButton.ToLower(), this.ShowPopover);
+            link.AddLink(ReportStrings.CommentButton.ToLower(), () => dialogOverlay?.Push(createDialog()));
         }
 
-        public Popover GetPopover()
+        private CommentReportDialog createDialog()
         {
-            var popover = new ReportCommentPopover(comment);
+            var dialog = new CommentReportDialog(comment, colourProvider);
 
-            popover.Submitted += () =>
+            dialog.Submitted += () =>
             {
                 link.Hide();
                 loading.Show();
             };
 
-            popover.Success += () => Schedule(() =>
+            dialog.Success += () => Schedule(() =>
             {
                 loading.Hide();
 
@@ -76,13 +76,13 @@ public Popover GetPopover()
                 this.FadeOut(2000, Easing.InQuint).Expire();
             });
 
-            popover.Failure += () => Schedule(() =>
+            dialog.Failure += () => Schedule(() =>
             {
                 loading.Hide();
                 link.Show();
             });
 
-            return popover;
+            return dialog;
         }
 
         public float LineBaseHeight => link.ChildrenOfType<IHasLineBaseHeight>().FirstOrDefault()?.LineBaseHeight ?? DrawHeight;
diff --git a/osu.Game/Overlays/Comments/ReportCommentPopover.cs b/osu.Game/Overlays/Comments/CommentReportDialog.cs
similarity index 77%
rename from osu.Game/Overlays/Comments/ReportCommentPopover.cs
rename to osu.Game/Overlays/Comments/CommentReportDialog.cs
index c975056e3e2f..83455c6f2963 100644
--- a/osu.Game/Overlays/Comments/ReportCommentPopover.cs
+++ b/osu.Game/Overlays/Comments/CommentReportDialog.cs
@@ -9,14 +9,14 @@
 
 namespace osu.Game.Overlays.Comments
 {
-    public partial class ReportCommentPopover : ReportPopover<CommentReportReason>
+    public partial class CommentReportDialog : ReportDialog<CommentReportReason>
     {
         private readonly Comment comment;
 
         protected override bool IsCommentRequired(CommentReportReason reason) => reason == CommentReportReason.Other;
 
-        public ReportCommentPopover(Comment comment)
-            : base(ReportStrings.CommentTitle(comment.User?.Username ?? comment.LegacyName ?? @"Someone"), false)
+        public CommentReportDialog(Comment comment, OverlayColourProvider? colourProvider = null)
+            : base(ReportStrings.CommentTitle(comment.User?.Username ?? comment.LegacyName ?? @"Someone"), false, colourProvider)
         {
             this.comment = comment;
         }
diff --git a/osu.Game/Overlays/Dialog/ButtonPopupDialog.cs b/osu.Game/Overlays/Dialog/ButtonPopupDialog.cs
new file mode 100644
index 000000000000..9634e8e8b03f
--- /dev/null
+++ b/osu.Game/Overlays/Dialog/ButtonPopupDialog.cs
@@ -0,0 +1,303 @@
+// 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.Collections.Generic;
+using System.Linq;
+using osu.Framework.Allocation;
+using osu.Framework.Audio;
+using osu.Framework.Audio.Sample;
+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.Framework.Input.Events;
+using osu.Framework.Localisation;
+using osu.Game.Graphics.Backgrounds;
+using osu.Game.Graphics.Containers;
+using osuTK;
+using osuTK.Graphics;
+using osuTK.Input;
+
+namespace osu.Game.Overlays.Dialog
+{
+    public abstract partial class ButtonPopupDialog : PopupDialog
+    {
+        private readonly Vector2 ringSize = new Vector2(100f);
+        private readonly Vector2 ringMinifiedSize = new Vector2(20f);
+
+        private readonly Box flashLayer;
+        private Sample? flashSample;
+
+        private readonly Container ring;
+        private readonly FillFlowContainer<PopupDialogButton> buttonsContainer;
+        private readonly SpriteIcon icon;
+        private readonly TextFlowContainer header;
+        private readonly TextFlowContainer body;
+
+        private bool actionInvoked;
+
+        public IconUsage Icon
+        {
+            get => icon.Icon;
+            set => icon.Icon = value;
+        }
+
+        private LocalisableString headerText;
+
+        public LocalisableString HeaderText
+        {
+            get => headerText;
+            set
+            {
+                if (headerText == value)
+                    return;
+
+                headerText = value;
+                header.Text = value;
+            }
+        }
+
+        private LocalisableString bodyText;
+
+        public LocalisableString BodyText
+        {
+            get => bodyText;
+            set
+            {
+                if (bodyText == value)
+                    return;
+
+                bodyText = value;
+
+                body.Text = value;
+                body.TextAnchor = bodyText.ToString().Contains('\n') ? Anchor.TopLeft : Anchor.TopCentre;
+            }
+        }
+
+        public IEnumerable<PopupDialogButton> Buttons
+        {
+            get => buttonsContainer.Children;
+            set
+            {
+                buttonsContainer.ChildrenEnumerable = value;
+
+                foreach (PopupDialogButton b in value)
+                {
+                    var action = b.Action;
+                    b.Action = () =>
+                    {
+                        if (actionInvoked) return;
+
+                        actionInvoked = true;
+
+                        // Hide the dialog before running the action.
+                        // This is important as the code which is performed may check for a dialog being present (ie. `OsuGame.PerformFromScreen`)
+                        // and we don't want it to see the already dismissed dialog.
+                        Hide();
+
+                        action?.Invoke();
+                    };
+                }
+            }
+        }
+
+        protected ButtonPopupDialog()
+        {
+            Children = new Drawable[]
+            {
+                new Container
+                {
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Children = new Drawable[]
+                    {
+                        new Container
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Children = new Drawable[]
+                            {
+                                new Box
+                                {
+                                    RelativeSizeAxes = Axes.Both,
+                                    Colour = Color4Extensions.FromHex(@"221a21"),
+                                },
+                                new Triangles
+                                {
+                                    RelativeSizeAxes = Axes.Both,
+                                    ColourLight = Color4Extensions.FromHex(@"271e26"),
+                                    ColourDark = Color4Extensions.FromHex(@"1e171e"),
+                                    TriangleScale = 4,
+                                },
+                                flashLayer = new Box
+                                {
+                                    Alpha = 0,
+                                    RelativeSizeAxes = Axes.Both,
+                                    Blending = BlendingParameters.Additive,
+                                    Colour = Color4Extensions.FromHex(@"221a21"),
+                                },
+                            },
+                        },
+                        new FillFlowContainer
+                        {
+                            RelativeSizeAxes = Axes.X,
+                            AutoSizeAxes = Axes.Y,
+                            Direction = FillDirection.Vertical,
+                            Spacing = new Vector2(0f, 10f),
+                            Padding = new MarginPadding { Vertical = 60 },
+                            Children = new Drawable[]
+                            {
+                                new Container
+                                {
+                                    Origin = Anchor.TopCentre,
+                                    Anchor = Anchor.TopCentre,
+                                    Padding = new MarginPadding { Bottom = 30 },
+                                    Size = ringSize,
+                                    Children = new Drawable[]
+                                    {
+                                        ring = new CircularContainer
+                                        {
+                                            Origin = Anchor.Centre,
+                                            Anchor = Anchor.Centre,
+                                            Masking = true,
+                                            BorderColour = Color4.White,
+                                            BorderThickness = 5f,
+                                            Children = new Drawable[]
+                                            {
+                                                new Box
+                                                {
+                                                    RelativeSizeAxes = Axes.Both,
+                                                    Colour = Color4.Black.Opacity(0),
+                                                },
+                                                icon = new SpriteIcon
+                                                {
+                                                    Origin = Anchor.Centre,
+                                                    Anchor = Anchor.Centre,
+                                                    Icon = FontAwesome.Solid.TimesCircle,
+                                                    Y = -2,
+                                                    Size = new Vector2(50),
+                                                },
+                                            },
+                                        },
+                                    },
+                                },
+                                header = new OsuTextFlowContainer(t => t.Font = t.Font.With(size: 25))
+                                {
+                                    Origin = Anchor.TopCentre,
+                                    Anchor = Anchor.TopCentre,
+                                    RelativeSizeAxes = Axes.X,
+                                    AutoSizeAxes = Axes.Y,
+                                    TextAnchor = Anchor.TopCentre,
+                                    Padding = new MarginPadding { Horizontal = 15, Bottom = 10 },
+                                },
+                                body = new OsuTextFlowContainer(t => t.Font = t.Font.With(size: 18))
+                                {
+                                    Origin = Anchor.TopCentre,
+                                    Anchor = Anchor.TopCentre,
+                                    RelativeSizeAxes = Axes.X,
+                                    AutoSizeAxes = Axes.Y,
+                                    Padding = new MarginPadding { Horizontal = 15 },
+                                },
+                                buttonsContainer = new FillFlowContainer<PopupDialogButton>
+                                {
+                                    Anchor = Anchor.TopCentre,
+                                    Origin = Anchor.TopCentre,
+                                    RelativeSizeAxes = Axes.X,
+                                    AutoSizeAxes = Axes.Y,
+                                    Direction = FillDirection.Vertical,
+                                    Padding = new MarginPadding { Top = 30 },
+                                },
+                            },
+                        },
+                    },
+                },
+            };
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(AudioManager audio)
+        {
+            flashSample = audio.Samples.Get(@"UI/default-select-disabled");
+        }
+
+        /// <summary>
+        /// Programmatically clicks the first <see cref="PopupDialogOkButton"/>.
+        /// </summary>
+        public void PerformOkAction() => PerformAction<PopupDialogOkButton>();
+
+        /// <summary>
+        /// Programmatically clicks the first button of the provided type.
+        /// </summary>
+        public void PerformAction<T>() where T : PopupDialogButton
+        {
+            // Buttons are regularly added in BDL or LoadComplete, so let's schedule to ensure
+            // they are ready to be pressed.
+            Scheduler.AddOnce(() => Buttons.OfType<T>().FirstOrDefault()?.TriggerClick());
+        }
+
+        public void Flash()
+        {
+            flashLayer.FadeInFromZero(80, Easing.OutQuint)
+                      .Then()
+                      .FadeOutFromOne(1500, Easing.OutQuint);
+            flashSample?.Play();
+        }
+
+        protected override bool OnKeyDown(KeyDownEvent e)
+        {
+            if (e.Repeat) return false;
+
+            // press button at number if 1-9 on number row or keypad are pressed
+            var k = e.Key;
+
+            if (k >= Key.Number1 && k <= Key.Number9)
+            {
+                pressButtonAtIndex(k - Key.Number1);
+                return true;
+            }
+
+            if (k >= Key.Keypad1 && k <= Key.Keypad9)
+            {
+                pressButtonAtIndex(k - Key.Keypad1);
+                return true;
+            }
+
+            return base.OnKeyDown(e);
+        }
+
+        protected override void PopIn()
+        {
+            base.PopIn();
+
+            actionInvoked = false;
+
+            // Reset various animations but only if the dialog animation fully completed
+            if (Dialog.Alpha == 0)
+            {
+                ring.ResizeTo(ringMinifiedSize);
+                icon.ScaleTo(0f);
+            }
+
+            ring.ResizeTo(ringSize, ENTER_DURATION * 1.5f, Easing.OutQuint);
+            icon.Delay(100).ScaleTo(1, ENTER_DURATION * 1.5f, Easing.OutQuint);
+        }
+
+        protected override void PopOut()
+        {
+            base.PopOut();
+
+            if (!actionInvoked)
+                // In the case a user did not choose an action before a hide was triggered, press the last button.
+                // This is presumed to always be a sane default "cancel" action.
+                buttonsContainer.Last().TriggerClick();
+        }
+
+        private void pressButtonAtIndex(int index)
+        {
+            if (index < Buttons.Count())
+                Buttons.Skip(index).First().TriggerClick();
+        }
+    }
+}
diff --git a/osu.Game/Overlays/Dialog/ConfirmDialog.cs b/osu.Game/Overlays/Dialog/ConfirmDialog.cs
index f6a5ca4f9ca1..fabf19eac59d 100644
--- a/osu.Game/Overlays/Dialog/ConfirmDialog.cs
+++ b/osu.Game/Overlays/Dialog/ConfirmDialog.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Overlays.Dialog
     /// <summary>
     /// A dialog which confirms a user action.
     /// </summary>
-    public partial class ConfirmDialog : PopupDialog
+    public partial class ConfirmDialog : ButtonPopupDialog
     {
         /// <summary>
         /// Construct a new confirmation dialog.
diff --git a/osu.Game/Overlays/Dialog/DangerousActionDialog.cs b/osu.Game/Overlays/Dialog/DangerousActionDialog.cs
index 287b0fa2c63d..a090a926c9e3 100644
--- a/osu.Game/Overlays/Dialog/DangerousActionDialog.cs
+++ b/osu.Game/Overlays/Dialog/DangerousActionDialog.cs
@@ -14,9 +14,9 @@ namespace osu.Game.Overlays.Dialog
     /// </summary>
     /// <remarks>
     /// The default implementation comes with text for a generic deletion operation.
-    /// This can be further customised by specifying custom <see cref="PopupDialog.HeaderText"/>.
+    /// This can be further customised by specifying custom <see cref="ButtonPopupDialog.HeaderText"/>.
     /// </remarks>
-    public abstract partial class DangerousActionDialog : PopupDialog
+    public abstract partial class DangerousActionDialog : ButtonPopupDialog
     {
         /// <summary>
         /// The action which performs the deletion.
diff --git a/osu.Game/Overlays/Dialog/PopupDialog.cs b/osu.Game/Overlays/Dialog/PopupDialog.cs
index 0fec1625ebe9..5b63babf5b9c 100644
--- a/osu.Game/Overlays/Dialog/PopupDialog.cs
+++ b/osu.Game/Overlays/Dialog/PopupDialog.cs
@@ -1,240 +1,54 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// 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.Collections.Generic;
-using System.Linq;
-using osu.Framework.Allocation;
-using osu.Framework.Audio;
-using osu.Framework.Audio.Sample;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Effects;
-using osu.Framework.Graphics.Shapes;
-using osu.Framework.Graphics.Sprites;
-using osu.Framework.Input.Events;
-using osu.Framework.Localisation;
-using osu.Game.Graphics;
-using osu.Game.Graphics.Backgrounds;
-using osu.Game.Graphics.Containers;
-using osuTK;
 using osuTK.Graphics;
-using osuTK.Input;
 
 namespace osu.Game.Overlays.Dialog
 {
     public abstract partial class PopupDialog : VisibilityContainer
     {
+        public const int DEFAULT_WIDTH = 500;
         public const float ENTER_DURATION = 500;
         public const float EXIT_DURATION = 500;
 
-        private readonly Vector2 ringSize = new Vector2(100f);
-        private readonly Vector2 ringMinifiedSize = new Vector2(20f);
-
-        private readonly Box flashLayer;
-        private Sample? flashSample;
+        protected Container Dialog { get; }
 
         private readonly Container content;
-        private readonly Container ring;
-        private readonly FillFlowContainer<PopupDialogButton> buttonsContainer;
-        private readonly SpriteIcon icon;
-        private readonly TextFlowContainer header;
-        private readonly TextFlowContainer body;
-
-        private bool actionInvoked;
-
-        public IconUsage Icon
-        {
-            get => icon.Icon;
-            set => icon.Icon = value;
-        }
-
-        private LocalisableString headerText;
-
-        public LocalisableString HeaderText
-        {
-            get => headerText;
-            set
-            {
-                if (headerText == value)
-                    return;
-
-                headerText = value;
-                header.Text = value;
-            }
-        }
-
-        private LocalisableString bodyText;
-
-        public LocalisableString BodyText
-        {
-            get => bodyText;
-            set
-            {
-                if (bodyText == value)
-                    return;
-
-                bodyText = value;
-
-                body.Text = value;
-                body.TextAnchor = bodyText.ToString().Contains('\n') ? Anchor.TopLeft : Anchor.TopCentre;
-            }
-        }
-
-        public IEnumerable<PopupDialogButton> Buttons
-        {
-            get => buttonsContainer.Children;
-            set
-            {
-                buttonsContainer.ChildrenEnumerable = value;
-
-                foreach (PopupDialogButton b in value)
-                {
-                    var action = b.Action;
-                    b.Action = () =>
-                    {
-                        if (actionInvoked) return;
-
-                        actionInvoked = true;
-
-                        // Hide the dialog before running the action.
-                        // This is important as the code which is performed may check for a dialog being present (ie. `OsuGame.PerformFromScreen`)
-                        // and we don't want it to see the already dismissed dialog.
-                        Hide();
-
-                        action?.Invoke();
-                    };
-                }
-            }
-        }
+        protected override Container<Drawable> Content => content;
 
         protected PopupDialog()
         {
-            RelativeSizeAxes = Axes.X;
+            Width = DEFAULT_WIDTH;
             AutoSizeAxes = Axes.Y;
 
             Anchor = Anchor.Centre;
             Origin = Anchor.Centre;
 
-            Children = new Drawable[]
+            InternalChild = Dialog = new Container
             {
-                content = new Container
+                RelativeSizeAxes = Axes.X,
+                AutoSizeAxes = Axes.Y,
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Alpha = 0f,
+                Masking = true,
+                CornerRadius = 20,
+                CornerExponent = 2.5f,
+                EdgeEffect = new EdgeEffectParameters
+                {
+                    Type = EdgeEffectType.Shadow,
+                    Colour = Color4.Black.Opacity(0.2f),
+                    Radius = 14,
+                },
+                Child = content = new Container
                 {
                     RelativeSizeAxes = Axes.X,
                     AutoSizeAxes = Axes.Y,
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    Alpha = 0f,
-                    Children = new Drawable[]
-                    {
-                        new Container
-                        {
-                            RelativeSizeAxes = Axes.Both,
-                            Masking = true,
-                            CornerRadius = 20,
-                            CornerExponent = 2.5f,
-                            EdgeEffect = new EdgeEffectParameters
-                            {
-                                Type = EdgeEffectType.Shadow,
-                                Colour = Color4.Black.Opacity(0.2f),
-                                Radius = 14,
-                            },
-                            Children = new Drawable[]
-                            {
-                                new Box
-                                {
-                                    RelativeSizeAxes = Axes.Both,
-                                    Colour = Color4Extensions.FromHex(@"221a21"),
-                                },
-                                new Triangles
-                                {
-                                    RelativeSizeAxes = Axes.Both,
-                                    ColourLight = Color4Extensions.FromHex(@"271e26"),
-                                    ColourDark = Color4Extensions.FromHex(@"1e171e"),
-                                    TriangleScale = 4,
-                                },
-                                flashLayer = new Box
-                                {
-                                    Alpha = 0,
-                                    RelativeSizeAxes = Axes.Both,
-                                    Blending = BlendingParameters.Additive,
-                                    Colour = Color4Extensions.FromHex(@"221a21"),
-                                },
-                            },
-                        },
-                        new FillFlowContainer
-                        {
-                            RelativeSizeAxes = Axes.X,
-                            AutoSizeAxes = Axes.Y,
-                            Direction = FillDirection.Vertical,
-                            Spacing = new Vector2(0f, 10f),
-                            Padding = new MarginPadding { Vertical = 60 },
-                            Children = new Drawable[]
-                            {
-                                new Container
-                                {
-                                    Origin = Anchor.TopCentre,
-                                    Anchor = Anchor.TopCentre,
-                                    Padding = new MarginPadding { Bottom = 30 },
-                                    Size = ringSize,
-                                    Children = new Drawable[]
-                                    {
-                                        ring = new CircularContainer
-                                        {
-                                            Origin = Anchor.Centre,
-                                            Anchor = Anchor.Centre,
-                                            Masking = true,
-                                            BorderColour = Color4.White,
-                                            BorderThickness = 5f,
-                                            Children = new Drawable[]
-                                            {
-                                                new Box
-                                                {
-                                                    RelativeSizeAxes = Axes.Both,
-                                                    Colour = Color4.Black.Opacity(0),
-                                                },
-                                                icon = new SpriteIcon
-                                                {
-                                                    Origin = Anchor.Centre,
-                                                    Anchor = Anchor.Centre,
-                                                    Icon = FontAwesome.Solid.TimesCircle,
-                                                    Y = -2,
-                                                    Size = new Vector2(50),
-                                                },
-                                            },
-                                        },
-                                    },
-                                },
-                                header = new OsuTextFlowContainer(t => t.Font = t.Font.With(size: 25))
-                                {
-                                    Origin = Anchor.TopCentre,
-                                    Anchor = Anchor.TopCentre,
-                                    RelativeSizeAxes = Axes.X,
-                                    AutoSizeAxes = Axes.Y,
-                                    TextAnchor = Anchor.TopCentre,
-                                    Padding = new MarginPadding { Horizontal = 15, Bottom = 10 },
-                                },
-                                body = new OsuTextFlowContainer(t => t.Font = t.Font.With(size: 18))
-                                {
-                                    Origin = Anchor.TopCentre,
-                                    Anchor = Anchor.TopCentre,
-                                    RelativeSizeAxes = Axes.X,
-                                    AutoSizeAxes = Axes.Y,
-                                    Padding = new MarginPadding { Horizontal = 15 },
-                                },
-                                buttonsContainer = new FillFlowContainer<PopupDialogButton>
-                                {
-                                    Anchor = Anchor.TopCentre,
-                                    Origin = Anchor.TopCentre,
-                                    RelativeSizeAxes = Axes.X,
-                                    AutoSizeAxes = Axes.Y,
-                                    Direction = FillDirection.Vertical,
-                                    Padding = new MarginPadding { Top = 30 },
-                                },
-                            },
-                        },
-                    },
-                },
+                }
             };
 
             // It's important we start in a visible state so our state fires on hide, even before load.
@@ -242,93 +56,22 @@ protected PopupDialog()
             Show();
         }
 
-        [BackgroundDependencyLoader]
-        private void load(AudioManager audio, OsuColour colours)
-        {
-            flashSample = audio.Samples.Get(@"UI/default-select-disabled");
-        }
-
-        /// <summary>
-        /// Programmatically clicks the first <see cref="PopupDialogOkButton"/>.
-        /// </summary>
-        public void PerformOkAction() => PerformAction<PopupDialogOkButton>();
-
-        /// <summary>
-        /// Programmatically clicks the first button of the provided type.
-        /// </summary>
-        public void PerformAction<T>() where T : PopupDialogButton
-        {
-            // Buttons are regularly added in BDL or LoadComplete, so let's schedule to ensure
-            // they are ready to be pressed.
-            Scheduler.AddOnce(() => Buttons.OfType<T>().FirstOrDefault()?.TriggerClick());
-        }
-
-        public void Flash()
-        {
-            flashLayer.FadeInFromZero(80, Easing.OutQuint)
-                      .Then()
-                      .FadeOutFromOne(1500, Easing.OutQuint);
-            flashSample?.Play();
-        }
-
-        protected override bool OnKeyDown(KeyDownEvent e)
-        {
-            if (e.Repeat) return false;
-
-            // press button at number if 1-9 on number row or keypad are pressed
-            var k = e.Key;
-
-            if (k >= Key.Number1 && k <= Key.Number9)
-            {
-                pressButtonAtIndex(k - Key.Number1);
-                return true;
-            }
-
-            if (k >= Key.Keypad1 && k <= Key.Keypad9)
-            {
-                pressButtonAtIndex(k - Key.Keypad1);
-                return true;
-            }
-
-            return base.OnKeyDown(e);
-        }
-
         protected override void PopIn()
         {
-            actionInvoked = false;
-
             // Reset various animations but only if the dialog animation fully completed
-            if (content.Alpha == 0)
-            {
-                content.ScaleTo(0.7f);
-                ring.ResizeTo(ringMinifiedSize);
-                icon.ScaleTo(0f);
-            }
+            if (Dialog.Alpha == 0)
+                Dialog.ScaleTo(0.7f);
 
-            content
+            Dialog
                 .ScaleTo(1, 750, Easing.OutElasticHalf)
                 .FadeIn(ENTER_DURATION, Easing.OutQuint);
-
-            ring.ResizeTo(ringSize, ENTER_DURATION * 1.5f, Easing.OutQuint);
-            icon.Delay(100).ScaleTo(1, ENTER_DURATION * 1.5f, Easing.OutQuint);
         }
 
         protected override void PopOut()
         {
-            if (!actionInvoked)
-                // In the case a user did not choose an action before a hide was triggered, press the last button.
-                // This is presumed to always be a sane default "cancel" action.
-                buttonsContainer.Last().TriggerClick();
-
-            content
+            Dialog
                 .ScaleTo(0.7f, EXIT_DURATION, Easing.Out)
                 .FadeOut(EXIT_DURATION, Easing.OutQuint);
         }
-
-        private void pressButtonAtIndex(int index)
-        {
-            if (index < Buttons.Count())
-                Buttons.Skip(index).First().TriggerClick();
-        }
     }
 }
diff --git a/osu.Game/Overlays/DialogOverlay.cs b/osu.Game/Overlays/DialogOverlay.cs
index 4e7aff84bcb1..0d127c1b8ed2 100644
--- a/osu.Game/Overlays/DialogOverlay.cs
+++ b/osu.Game/Overlays/DialogOverlay.cs
@@ -4,12 +4,12 @@
 #nullable disable
 
 using System;
+using System.Linq;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Overlays.Dialog;
 using osu.Game.Graphics.Containers;
 using osu.Game.Input.Bindings;
-using System.Linq;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Input.Events;
@@ -36,16 +36,13 @@ public partial class DialogOverlay : OsuFocusedOverlayContainer, IDialogOverlay
 
         public DialogOverlay()
         {
-            AutoSizeAxes = Axes.Y;
+            AutoSizeAxes = Axes.Both;
 
             Child = dialogContainer = new Container
             {
-                RelativeSizeAxes = Axes.X,
-                AutoSizeAxes = Axes.Y,
+                AutoSizeAxes = Axes.Both,
             };
 
-            Width = 500;
-
             Anchor = Anchor.Centre;
             Origin = Anchor.Centre;
         }
@@ -129,12 +126,15 @@ public override bool OnPressed(KeyBindingPressEvent<GlobalAction> e)
             if (e.Repeat)
                 return false;
 
+            if (CurrentDialog is not ButtonPopupDialog buttonPopupDialog)
+                return false;
+
             switch (e.Action)
             {
                 case GlobalAction.Select:
                     var clickableButton =
-                        CurrentDialog?.Buttons.OfType<PopupDialogOkButton>().FirstOrDefault() ??
-                        CurrentDialog?.Buttons.First();
+                        buttonPopupDialog.Buttons.OfType<PopupDialogOkButton>().FirstOrDefault() ??
+                        buttonPopupDialog.Buttons.First();
 
                     clickableButton?.TriggerClick();
                     return true;
diff --git a/osu.Game/Overlays/Profile/Header/Components/UserActionsButton.cs b/osu.Game/Overlays/Profile/Header/Components/UserActionsButton.cs
index 90f2a61c7e69..5a910b04206e 100644
--- a/osu.Game/Overlays/Profile/Header/Components/UserActionsButton.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/UserActionsButton.cs
@@ -5,9 +5,6 @@
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.UserInterface;
 using osu.Game.Online.API;
@@ -21,27 +18,9 @@ public partial class UserActionsButton : ProfileActionsButton
     {
         public readonly Bindable<UserProfileData?> User = new Bindable<UserProfileData?>();
 
-        private UserReportPopoverTarget reportPopoverTarget = null!;
-
         [Resolved]
         private IAPIProvider api { get; set; } = null!;
 
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            // This is a bit of a dirty hack. Because `ReportUserPopover` is spawned from `UserActionsPopover`,
-            // and that they both share the same `PopoverContainer`, the former will get destroyed when the latter
-            // is opened, causing it to get destroyed as well.
-            //
-            // This is worked around by having an additional dummy popover target on the actions button,
-            // which is then passed to `UserActionsPopover` and the user report action. This way the popover
-            // can remain attached to it once the actions popover is destroyed.
-            Add(reportPopoverTarget = new UserReportPopoverTarget
-            {
-                RelativeSizeAxes = Axes.Both
-            });
-        }
-
         protected override void LoadComplete()
         {
             base.LoadComplete();
@@ -49,22 +28,18 @@ protected override void LoadComplete()
             User.BindValueChanged(_ =>
             {
                 Alpha = User.Value?.User.OnlineID == api.LocalUser.Value.OnlineID ? 0 : 1;
-                reportPopoverTarget.User = User.Value?.User;
             }, true);
         }
 
-        public override Popover GetPopover() => new UserActionPopover(User.Value!.User, reportPopoverTarget);
+        public override Popover GetPopover() => new UserActionPopover(User.Value!.User);
 
         private partial class UserActionPopover : ProfileActionPopover
         {
             private readonly APIUser user;
 
-            private readonly IHasPopover reportPopoverTarget;
-
-            public UserActionPopover(APIUser user, IHasPopover reportPopoverTarget)
+            public UserActionPopover(APIUser user)
             {
                 this.user = user;
-                this.reportPopoverTarget = reportPopoverTarget;
             }
 
             [BackgroundDependencyLoader]
@@ -86,19 +61,12 @@ private void load(IAPIProvider api, IDialogOverlay? dialogOverlay)
                     {
                         Action = () =>
                         {
+                            dialogOverlay?.Push(new UserReportDialog(user));
                             this.HidePopover();
-                            reportPopoverTarget.ShowPopover();
                         }
                     },
                 };
             }
         }
-
-        private partial class UserReportPopoverTarget : Container, IHasPopover
-        {
-            public APIUser? User;
-
-            public Popover? GetPopover() => User != null ? new ReportUserPopover(User) : null;
-        }
     }
 }
diff --git a/osu.Game/Overlays/Profile/ReportUserPopover.cs b/osu.Game/Overlays/Profile/UserReportDialog.cs
similarity index 71%
rename from osu.Game/Overlays/Profile/ReportUserPopover.cs
rename to osu.Game/Overlays/Profile/UserReportDialog.cs
index c04d76bd9025..73ef4e7974f2 100644
--- a/osu.Game/Overlays/Profile/ReportUserPopover.cs
+++ b/osu.Game/Overlays/Profile/UserReportDialog.cs
@@ -9,12 +9,12 @@
 
 namespace osu.Game.Overlays.Profile
 {
-    public partial class ReportUserPopover : ReportPopover<UserReportReason>
+    public partial class UserReportDialog : ReportDialog<UserReportReason>
     {
         private readonly APIUser user;
 
-        public ReportUserPopover(APIUser user)
-            : base(ReportStrings.UserTitle(user.Username))
+        public UserReportDialog(APIUser user, OverlayColourProvider? colourProvider = null)
+            : base(ReportStrings.UserTitle(user.Username), true, colourProvider)
         {
             this.user = user;
         }
diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectoryLocationDialog.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectoryLocationDialog.cs
index ff10a0a84e0e..b8382b82ab09 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectoryLocationDialog.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectoryLocationDialog.cs
@@ -11,7 +11,7 @@
 
 namespace osu.Game.Overlays.Settings.Sections.Maintenance
 {
-    public partial class StableDirectoryLocationDialog : PopupDialog
+    public partial class StableDirectoryLocationDialog : ButtonPopupDialog
     {
         [Resolved]
         private IPerformFromScreenRunner performer { get; set; } = null!;
diff --git a/osu.Game/Screens/Edit/CreateNewDifficultyDialog.cs b/osu.Game/Screens/Edit/CreateNewDifficultyDialog.cs
index 811da5236e12..6b132b77f6fd 100644
--- a/osu.Game/Screens/Edit/CreateNewDifficultyDialog.cs
+++ b/osu.Game/Screens/Edit/CreateNewDifficultyDialog.cs
@@ -7,7 +7,7 @@
 
 namespace osu.Game.Screens.Edit
 {
-    public partial class CreateNewDifficultyDialog : PopupDialog
+    public partial class CreateNewDifficultyDialog : ButtonPopupDialog
     {
         /// <summary>
         /// Delegate used to create new difficulties.
diff --git a/osu.Game/Screens/Edit/DiscardUnsavedChangesDialog.cs b/osu.Game/Screens/Edit/DiscardUnsavedChangesDialog.cs
index 1867b4883038..f499b70dc56f 100644
--- a/osu.Game/Screens/Edit/DiscardUnsavedChangesDialog.cs
+++ b/osu.Game/Screens/Edit/DiscardUnsavedChangesDialog.cs
@@ -8,7 +8,7 @@
 
 namespace osu.Game.Screens.Edit
 {
-    public partial class DiscardUnsavedChangesDialog : PopupDialog
+    public partial class DiscardUnsavedChangesDialog : ButtonPopupDialog
     {
         public DiscardUnsavedChangesDialog(Action exit)
         {
diff --git a/osu.Game/Screens/Edit/PromptForSaveDialog.cs b/osu.Game/Screens/Edit/PromptForSaveDialog.cs
index 7d78465e6c16..2aa6b068b836 100644
--- a/osu.Game/Screens/Edit/PromptForSaveDialog.cs
+++ b/osu.Game/Screens/Edit/PromptForSaveDialog.cs
@@ -8,7 +8,7 @@
 
 namespace osu.Game.Screens.Edit
 {
-    public partial class PromptForSaveDialog : PopupDialog
+    public partial class PromptForSaveDialog : ButtonPopupDialog
     {
         public PromptForSaveDialog(Action exit, Action saveAndExit, Action cancel)
         {
diff --git a/osu.Game/Screens/Edit/SaveAndReloadEditorDialog.cs b/osu.Game/Screens/Edit/SaveAndReloadEditorDialog.cs
index b73c7cfff8f0..f3c9ca76d89f 100644
--- a/osu.Game/Screens/Edit/SaveAndReloadEditorDialog.cs
+++ b/osu.Game/Screens/Edit/SaveAndReloadEditorDialog.cs
@@ -8,7 +8,7 @@
 
 namespace osu.Game.Screens.Edit
 {
-    public partial class SaveAndReloadEditorDialog : PopupDialog
+    public partial class SaveAndReloadEditorDialog : ButtonPopupDialog
     {
         public SaveAndReloadEditorDialog(Action reload, Action cancel)
         {
diff --git a/osu.Game/Screens/Edit/SaveRequiredPopupDialog.cs b/osu.Game/Screens/Edit/SaveRequiredPopupDialog.cs
index 5c690378256d..009baaa8ed9d 100644
--- a/osu.Game/Screens/Edit/SaveRequiredPopupDialog.cs
+++ b/osu.Game/Screens/Edit/SaveRequiredPopupDialog.cs
@@ -8,7 +8,7 @@
 
 namespace osu.Game.Screens.Edit
 {
-    public partial class SaveRequiredPopupDialog : PopupDialog
+    public partial class SaveRequiredPopupDialog : ButtonPopupDialog
     {
         public SaveRequiredPopupDialog(Action saveAndAction)
         {
diff --git a/osu.Game/Screens/Menu/ConfirmDiscardChangesDialog.cs b/osu.Game/Screens/Menu/ConfirmDiscardChangesDialog.cs
index b57d786f5687..121b0a52abe1 100644
--- a/osu.Game/Screens/Menu/ConfirmDiscardChangesDialog.cs
+++ b/osu.Game/Screens/Menu/ConfirmDiscardChangesDialog.cs
@@ -8,7 +8,7 @@
 
 namespace osu.Game.Screens.Menu
 {
-    public partial class ConfirmDiscardChangesDialog : PopupDialog
+    public partial class ConfirmDiscardChangesDialog : ButtonPopupDialog
     {
         /// <summary>
         /// Construct a new discard changes confirmation dialog.
diff --git a/osu.Game/Screens/Menu/ConfirmExitDialog.cs b/osu.Game/Screens/Menu/ConfirmExitDialog.cs
index 9ed26bfb3f7e..e2fa91461719 100644
--- a/osu.Game/Screens/Menu/ConfirmExitDialog.cs
+++ b/osu.Game/Screens/Menu/ConfirmExitDialog.cs
@@ -12,7 +12,7 @@
 
 namespace osu.Game.Screens.Menu
 {
-    public partial class ConfirmExitDialog : PopupDialog
+    public partial class ConfirmExitDialog : ButtonPopupDialog
     {
         private readonly Action onConfirm;
         private readonly Action? onCancel;
diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index 32062409d0bf..4857205d744e 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -489,7 +489,7 @@ public void OnReleased(KeyBindingReleaseEvent<GlobalAction> e)
 
         private void loadRankedPlay() => this.Push(new OnlinePlay.Matchmaking.Intro.ScreenIntro(MatchmakingPoolType.RankedPlay));
 
-        private partial class MobileDisclaimerDialog : PopupDialog
+        private partial class MobileDisclaimerDialog : ButtonPopupDialog
         {
             public MobileDisclaimerDialog(Action confirmed)
             {
diff --git a/osu.Game/Screens/Menu/StorageErrorDialog.cs b/osu.Game/Screens/Menu/StorageErrorDialog.cs
index 677a3b02780b..f11cced24729 100644
--- a/osu.Game/Screens/Menu/StorageErrorDialog.cs
+++ b/osu.Game/Screens/Menu/StorageErrorDialog.cs
@@ -12,7 +12,7 @@
 
 namespace osu.Game.Screens.Menu
 {
-    public partial class StorageErrorDialog : PopupDialog
+    public partial class StorageErrorDialog : ButtonPopupDialog
     {
         [Resolved]
         private IDialogOverlay dialogOverlay { get; set; } = null!;
diff --git a/osu.Game/Screens/OnlinePlay/Matchmaking/RankedPlay/HamburgerMenu.cs b/osu.Game/Screens/OnlinePlay/Matchmaking/RankedPlay/HamburgerMenu.cs
index 2d422b525212..6e6fa5dfafdf 100644
--- a/osu.Game/Screens/OnlinePlay/Matchmaking/RankedPlay/HamburgerMenu.cs
+++ b/osu.Game/Screens/OnlinePlay/Matchmaking/RankedPlay/HamburgerMenu.cs
@@ -21,19 +21,23 @@ namespace osu.Game.Screens.OnlinePlay.Matchmaking.RankedPlay
 {
     public partial class HamburgerMenu : IconButton, IHasPopover
     {
+        public Action? ReportRequested;
+
         public HamburgerMenu()
         {
             Icon = FontAwesome.Solid.Bars;
             Action = this.ShowPopover;
         }
 
-        public Framework.Graphics.UserInterface.Popover GetPopover() => new Popover();
+        public Framework.Graphics.UserInterface.Popover GetPopover() => new Popover { ReportRequested = ReportRequested };
 
         private partial class Popover : OsuPopover
         {
             [Resolved]
             private RankedPlayScreen? rankedPlayScreen { get; set; }
 
+            public Action? ReportRequested;
+
             private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Pink);
             private FillFlowContainer buttonFlow = null!;
 
@@ -50,6 +54,7 @@ private void load()
                 };
 
                 addButton(rankedPlayScreen?.ActiveSubScreen is not EndedScreen ? "Give up" : "Exit", FontAwesome.Solid.SignOutAlt, () => rankedPlayScreen?.Exit());
+                addButton("Report opponent", FontAwesome.Solid.ExclamationTriangle, () => ReportRequested?.Invoke());
             }
 
             protected override void LoadComplete()
diff --git a/osu.Game/Screens/OnlinePlay/Matchmaking/RankedPlay/RankedPlayScreen.cs b/osu.Game/Screens/OnlinePlay/Matchmaking/RankedPlay/RankedPlayScreen.cs
index b087472b77b0..b9349dd8a0ce 100644
--- a/osu.Game/Screens/OnlinePlay/Matchmaking/RankedPlay/RankedPlayScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Matchmaking/RankedPlay/RankedPlayScreen.cs
@@ -25,6 +25,7 @@
 using osu.Game.Online.Rooms;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Dialog;
+using osu.Game.Overlays.Profile;
 using osu.Game.Overlays.Volume;
 using osu.Game.Rulesets;
 using osu.Game.Screens.OnlinePlay.Components;
@@ -153,6 +154,7 @@ public RankedPlayScreen(MultiplayerRoom room)
                             new HamburgerMenu
                             {
                                 Size = new Vector2(56),
+                                ReportRequested = () => dialogOverlay.Push(new UserReportDialog(opponentUser, new OverlayColourProvider(OverlayColourScheme.Pink))),
                             }
                         }
                     }