diff --git a/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
index d0fc66252e5c..8b05fa8f7a0a 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,36 +698,46 @@ 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", () =>
             {
-                var reason = this.ChildrenOfType<OsuEnumDropdown<ChatReportReason>>().Single();
+                var reason = this.ChildrenOfType<FormEnumDropdown<ChatReportReason>>().Single();
                 reason.Current.Value = ChatReportReason.Other;
             });
 
             AddStep("Try to report", () =>
             {
-                var btn = this.ChildrenOfType<ReportChatPopover>().Single().ChildrenOfType<RoundedButton>().Single();
+                var btn = this.ChildrenOfType<ReportChatDialog.SubmitButton>().Single();
                 InputManager.MoveMouseTo(btn);
                 InputManager.Click(MouseButton.Left);
             });
 
-            AddAssert("Nothing happened", () => this.ChildrenOfType<ReportChatPopover>().Any());
+            AddAssert("Nothing happened", () => this.ChildrenOfType<ReportChatDialog>().Any());
             AddStep("Set report data", () =>
             {
-                var field = this.ChildrenOfType<ReportChatPopover>().Single().ChildrenOfType<OsuTextBox>().First();
+                var field = this.ChildrenOfType<ReportChatDialog>().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<ReportChatDialog.SubmitButton>().Single();
                 InputManager.MoveMouseTo(btn);
                 InputManager.Click(MouseButton.Left);
             });
 
-            AddUntilStep("Overlay closed", () => !this.ChildrenOfType<ReportChatPopover>().Any());
+            AddUntilStep("Overlay closed", () => !this.ChildrenOfType<ReportChatDialog>().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..30da8be4361b 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneCommentActions.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneCommentActions.cs
@@ -255,30 +255,30 @@ public void TestReport()
             });
             AddStep("Set reason to other", () =>
             {
-                var reason = this.ChildrenOfType<OsuEnumDropdown<CommentReportReason>>().Single();
+                var reason = this.ChildrenOfType<FormEnumDropdown<CommentReportReason>>().Single();
                 reason.Current.Value = CommentReportReason.Other;
             });
             AddStep("Try to report", () =>
             {
-                var btn = this.ChildrenOfType<ReportCommentPopover>().Single().ChildrenOfType<RoundedButton>().Single();
+                var btn = this.ChildrenOfType<ReportCommentDialog.SubmitButton>().First();
                 InputManager.MoveMouseTo(btn);
                 InputManager.Click(MouseButton.Left);
             });
             AddWaitStep("Wait", 3);
-            AddAssert("Nothing happened", () => this.ChildrenOfType<ReportCommentPopover>().Any());
+            AddAssert("Nothing happened", () => this.ChildrenOfType<ReportCommentDialog>().Any());
             AddStep("Add comment", () =>
             {
-                var field = this.ChildrenOfType<ReportCommentPopover>().Single().ChildrenOfType<OsuTextBox>().First();
+                var field = this.ChildrenOfType<ReportCommentDialog>().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<ReportCommentDialog.SubmitButton>().First();
                 InputManager.MoveMouseTo(btn);
                 InputManager.Click(MouseButton.Left);
             });
             AddWaitStep("Wait", 3);
-            AddAssert("Overlay closed", () => !this.ChildrenOfType<ReportCommentPopover>().Any());
+            AddAssert("Overlay closed", () => !this.ChildrenOfType<ReportCommentDialog>().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 59%
rename from osu.Game.Tests/Visual/Online/TestSceneReportPopover.cs
rename to osu.Game.Tests/Visual/Online/TestSceneReportDialog.cs
index e2e90535d02c..5d31b896419b 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneReportPopover.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneReportDialog.cs
@@ -4,37 +4,32 @@
 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;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
 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;
+using osu.Game.Overlays.Settings;
+using osu.Game.Resources.Localisation.Web;
 
 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!.PerformAction<TestReportDialog.SubmitButton>());
+            AddWaitStep("wait", 3);
+            AddAssert("nothing happened", () => dialogOverlay.CurrentDialog!.ChildrenOfType<LoadingLayer>().First().IsReadOnly, () => Is.False);
+
             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);
+            AddStep("send report", () => dialogOverlay.CurrentDialog!.PerformAction<TestReportDialog.SubmitButton>());
+
+            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 header text is updated", () => dialogOverlay.CurrentDialog!.HeaderText, () => Is.EqualTo(UsersStrings.ReportThanks));
+            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);
+            AddStep("send report", () => dialogOverlay.CurrentDialog!.PerformAction<TestReportDialog.SubmitButton>());
+
+            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 error is present", () => this.ChildrenOfType<SettingsNote>().First().Current.Value?.Text.ToString(), () => Is.EqualTo("test error"));
+            AddAssert("ensure header text is not updated", () => dialogOverlay.CurrentDialog!.HeaderText.ToString(), () => Is.EqualTo("Report test?"));
         }
 
-        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/UserInterface/TestScenePopupDialog.cs b/osu.Game.Tests/Visual/UserInterface/TestScenePopupDialog.cs
index 96d19911bd4b..705655b8e20a 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestScenePopupDialog.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestScenePopupDialog.cs
@@ -1,9 +1,13 @@
 // 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.Allocation;
+using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Testing;
+using osu.Game.Graphics;
 using osu.Game.Overlays.Dialog;
 using osuTK;
 using osuTK.Input;
@@ -47,14 +51,25 @@ public void TestDangerousButton([Values(false, true)] bool atEdge)
 
             AddStep("hold button", () => InputManager.PressButton(MouseButton.Left));
             AddUntilStep("action invoked", () => dialog.DangerousButtonInvoked);
+            AddAssert("dialog is hidden", () => dialog.State.Value, () => Is.EqualTo(Visibility.Hidden));
             AddStep("release button", () => InputManager.ReleaseButton(MouseButton.Left));
         }
 
+        [Test]
+        public void TestHideDialogBeforeInvoke()
+        {
+            AddStep("move mouse to button", () => InputManager.MoveMouseTo(dialog.ChildrenOfType<NonHideButton>().First()));
+            AddStep("click button", () => InputManager.Click(MouseButton.Left));
+            AddAssert("action invoked", () => dialog.NonHideActionInvoked, () => Is.True);
+            AddAssert("dialog is still visible", () => dialog.State.Value, () => Is.EqualTo(Visibility.Visible));
+        }
+
         private partial class TestPopupDialog : PopupDialog
         {
             public PopupDialogDangerousButton DangerousButton { get; }
 
             public bool DangerousButtonInvoked;
+            public bool NonHideActionInvoked;
 
             public TestPopupDialog()
             {
@@ -78,8 +93,28 @@ public TestPopupDialog()
                         Text = @"Careful with this one..",
                         Action = () => DangerousButtonInvoked = true,
                     },
+                    new NonHideButton
+                    {
+                        Action = () => NonHideActionInvoked = true,
+                    },
                 };
             }
         }
+
+        private partial class NonHideButton : PopupDialogButton
+        {
+            public override bool HideDialogBeforeInvoke => false;
+
+            public NonHideButton()
+            {
+                Text = @"This button will not hide the dialog!";
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(OsuColour colours)
+            {
+                ButtonColour = colours.Yellow;
+            }
+        }
     }
 }
diff --git a/osu.Game/Graphics/UserInterfaceV2/FormTextBox.cs b/osu.Game/Graphics/UserInterfaceV2/FormTextBox.cs
index 746683149886..c645eb74b189 100644
--- a/osu.Game/Graphics/UserInterfaceV2/FormTextBox.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/FormTextBox.cs
@@ -57,7 +57,7 @@ public CompositeDrawable? TabbableContentContainer
 
         public event TextBox.OnCommitHandler? OnCommit;
 
-        private readonly BindableWithCurrent<string> current = new BindableWithCurrent<string>();
+        private readonly BindableWithCurrent<string> current = new BindableWithCurrent<string>(string.Empty);
 
         /// <summary>
         /// Caption describing this slider bar, displayed on top of the controls.
diff --git a/osu.Game/Graphics/UserInterfaceV2/ReportDialog.cs b/osu.Game/Graphics/UserInterfaceV2/ReportDialog.cs
new file mode 100644
index 000000000000..97bd8511a1f9
--- /dev/null
+++ b/osu.Game/Graphics/UserInterfaceV2/ReportDialog.cs
@@ -0,0 +1,218 @@
+// 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.Sprites;
+using osu.Framework.Localisation;
+using osu.Game.Graphics.Containers;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Online.API;
+using osu.Game.Overlays;
+using osu.Game.Overlays.Dialog;
+using osu.Game.Overlays.Settings;
+using osu.Game.Resources.Localisation.Web;
+using osuTK;
+using WebCommonStrings = osu.Game.Resources.Localisation.Web.CommonStrings;
+
+namespace osu.Game.Graphics.UserInterfaceV2
+{
+    /// <summary>
+    /// A generic 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
+    {
+        [Resolved]
+        private IAPIProvider api { get; set; } = null!;
+
+        /// <summary>
+        /// Intentionally hardcoded to `OverlayColourScheme.Plum` since it fits well
+        /// with the colour scheme of the `PopupDialog`.
+        /// </summary>
+        [Cached]
+        private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Plum);
+
+        /// <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 readonly ReverseChildIDFillFlowContainer<Drawable> form;
+        private readonly FormEnumDropdown<TReportReason> reasonDropdown;
+        private readonly FormTextBox commentsTextBox;
+        private readonly SettingsNote errorNote;
+        private readonly PopupDialogButton submitButton;
+        private readonly LoadingLayer loadingLayer;
+
+        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 `true` if you're displaying a custom message outside of this dialog.
+        /// </param>
+        protected ReportDialog(LocalisableString headerString, bool showConfirmation = true)
+        {
+            this.showConfirmation = showConfirmation;
+
+            Icon = FontAwesome.Solid.ExclamationTriangle;
+            HeaderText = headerString;
+
+            MainContent.Add(form = new ReverseChildIDFillFlowContainer<Drawable>
+            {
+                Direction = FillDirection.Vertical,
+                RelativeSizeAxes = Axes.X,
+                AutoSizeAxes = Axes.Y,
+                Spacing = new Vector2(7),
+                Padding = new MarginPadding { Horizontal = 20 },
+                Children = new Drawable[]
+                {
+                    reasonDropdown = new FormEnumDropdown<TReportReason>
+                    {
+                        Caption = UsersStrings.ReportReason,
+                    },
+                    commentsTextBox = new FormTextBox
+                    {
+                        Caption = UsersStrings.ReportComments,
+                        PlaceholderText = UsersStrings.ReportPlaceholder,
+                    },
+                    errorNote = new SettingsNote
+                    {
+                        RelativeSizeAxes = Axes.X,
+                    },
+                },
+            });
+
+            Add(loadingLayer = new LoadingLayer(true)
+            {
+                RelativeSizeAxes = Axes.Both,
+            });
+
+            Buttons = new[]
+            {
+                submitButton = new SubmitButton
+                {
+                    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
+                        Content.AutoSizeEasing = Easing.OutQuint;
+                        Content.AutoSizeDuration = 500F;
+
+                        Submitted?.Invoke();
+                        performRequest();
+
+                        if (!showConfirmation)
+                            Hide();
+                    }
+                },
+                new PopupDialogCancelButton { Text = WebCommonStrings.ButtonsCancel },
+            };
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            commentsTextBox.Current.BindValueChanged(_ => updateStatus());
+
+            reasonDropdown.Current.BindValueChanged(_ => updateStatus());
+
+            updateStatus();
+        }
+
+        private void performRequest()
+        {
+            var request = GetRequest(reasonDropdown.Current.Value, commentsTextBox.Current.Value);
+
+            request.Success += handleSuccess;
+            request.Failure += handleFailure;
+
+            api.Queue(request);
+        }
+
+        private void handleSuccess()
+        {
+            if (showConfirmation)
+            {
+                Schedule(() =>
+                {
+                    form.Hide();
+                    Buttons = [];
+                    HeaderText = UsersStrings.ReportThanks;
+
+                    loadingLayer.Hide();
+                    Scheduler.AddDelayed(Hide, 2000);
+                });
+            }
+
+            Success?.Invoke();
+        }
+
+        private void handleFailure(Exception e)
+        {
+            if (showConfirmation)
+            {
+                Schedule(() => errorNote.Current.Value = new SettingsNote.Data(e.Message, SettingsNote.Type.Critical));
+                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 SubmitButton : PopupDialogButton
+        {
+            public override bool HideDialogBeforeInvoke => false;
+
+            public SubmitButton()
+                : base(HoverSampleSet.DialogOk)
+            {
+                Text = UsersStrings.ReportActionsSend;
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(OsuColour colours)
+            {
+                ButtonColour = colours.Red;
+            }
+        }
+    }
+}
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/Overlays/Chat/ChatLine.cs b/osu.Game/Overlays/Chat/ChatLine.cs
index 427d874f121a..4b3b7aba8627 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 ReportChatDialog(message));
         }
 
-        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/ReportChatDialog.cs
similarity index 94%
rename from osu.Game/Overlays/Chat/ReportChatPopover.cs
rename to osu.Game/Overlays/Chat/ReportChatDialog.cs
index 5a209fec5915..15e5e06c2cc3 100644
--- a/osu.Game/Overlays/Chat/ReportChatPopover.cs
+++ b/osu.Game/Overlays/Chat/ReportChatDialog.cs
@@ -10,14 +10,14 @@
 
 namespace osu.Game.Overlays.Chat
 {
-    public partial class ReportChatPopover : ReportPopover<ChatReportReason>
+    public partial class ReportChatDialog : ReportDialog<ChatReportReason>
     {
         [Resolved]
         private ChannelManager channelManager { get; set; } = null!;
 
         private readonly Message message;
 
-        public ReportChatPopover(Message message)
+        public ReportChatDialog(Message message)
             : base(ReportStrings.UserTitle(message.Sender?.Username ?? @"Someone"), false)
         {
             this.message = message;
diff --git a/osu.Game/Overlays/Comments/CommentReportButton.cs b/osu.Game/Overlays/Comments/CommentReportButton.cs
index 8303a13e5ce9..c6a8063ddebe 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 ReportCommentDialog createDialog()
         {
-            var popover = new ReportCommentPopover(comment);
+            var dialog = new ReportCommentDialog(comment);
 
-            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/ReportCommentDialog.cs
similarity index 86%
rename from osu.Game/Overlays/Comments/ReportCommentPopover.cs
rename to osu.Game/Overlays/Comments/ReportCommentDialog.cs
index c975056e3e2f..eacef3b420c3 100644
--- a/osu.Game/Overlays/Comments/ReportCommentPopover.cs
+++ b/osu.Game/Overlays/Comments/ReportCommentDialog.cs
@@ -9,13 +9,13 @@
 
 namespace osu.Game.Overlays.Comments
 {
-    public partial class ReportCommentPopover : ReportPopover<CommentReportReason>
+    public partial class ReportCommentDialog : ReportDialog<CommentReportReason>
     {
         private readonly Comment comment;
 
         protected override bool IsCommentRequired(CommentReportReason reason) => reason == CommentReportReason.Other;
 
-        public ReportCommentPopover(Comment comment)
+        public ReportCommentDialog(Comment comment)
             : base(ReportStrings.CommentTitle(comment.User?.Username ?? comment.LegacyName ?? @"Someone"), false)
         {
             this.comment = comment;
diff --git a/osu.Game/Overlays/Dialog/PopupDialog.cs b/osu.Game/Overlays/Dialog/PopupDialog.cs
index 8522c00c20f4..2cdc2cb7459b 100644
--- a/osu.Game/Overlays/Dialog/PopupDialog.cs
+++ b/osu.Game/Overlays/Dialog/PopupDialog.cs
@@ -40,6 +40,8 @@ public abstract partial class PopupDialog : VisibilityContainer
         private readonly TextFlowContainer header;
         private readonly TextFlowContainer body;
 
+        protected override Container<Drawable> Content => content;
+
         public Container MainContent { get; private set; }
 
         private bool actionInvoked;
@@ -89,6 +91,13 @@ public IEnumerable<PopupDialogButton> Buttons
             {
                 buttonsContainer.ChildrenEnumerable = value;
 
+                // Hide the container if it is empty, so that it doesn't unnecessarily
+                // insert its padding into the parent container.
+                if (buttonsContainer.Children.Any())
+                    buttonsContainer.Show();
+                else
+                    buttonsContainer.Hide();
+
                 foreach (PopupDialogButton b in value)
                 {
                     var action = b.Action;
@@ -96,14 +105,26 @@ public IEnumerable<PopupDialogButton> Buttons
                     {
                         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();
+                        //
+                        // Can be overriden using `PopupDialogButton.HideDialogBeforeInvoke` if a dialog needs to remain
+                        // open after invoking an action (eg. report forms).
+                        if (b.HideDialogBeforeInvoke)
+                        {
+                            actionInvoked = true;
+                            Hide();
+                        }
 
                         action?.Invoke();
+
+                        // Delay setting `actionInvoke` for buttons requesting not to hide the dialog before invoke
+                        // until after the action has been invoked, so that the popup hide logic in `PopOut` can fire properly.
+                        //
+                        // This is done assuming the invoked action will handle hiding the dialog itself.
+                        if (!b.HideDialogBeforeInvoke)
+                            actionInvoked = true;
                     };
                 }
             }
@@ -117,7 +138,7 @@ protected PopupDialog()
             Anchor = Anchor.Centre;
             Origin = Anchor.Centre;
 
-            Children = new Drawable[]
+            InternalChildren = new Drawable[]
             {
                 content = new Container
                 {
@@ -125,21 +146,21 @@ protected PopupDialog()
                     AutoSizeAxes = Axes.Y,
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
+                    Masking = true,
+                    CornerRadius = 20,
+                    CornerExponent = 2.5f,
+                    EdgeEffect = new EdgeEffectParameters
+                    {
+                        Type = EdgeEffectType.Shadow,
+                        Colour = Color4.Black.Opacity(0.2f),
+                        Radius = 14,
+                    },
                     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
diff --git a/osu.Game/Overlays/Dialog/PopupDialogButton.cs b/osu.Game/Overlays/Dialog/PopupDialogButton.cs
index 3b641d6f3278..d9aa7452bd6f 100644
--- a/osu.Game/Overlays/Dialog/PopupDialogButton.cs
+++ b/osu.Game/Overlays/Dialog/PopupDialogButton.cs
@@ -7,6 +7,15 @@ namespace osu.Game.Overlays.Dialog
 {
     public partial class PopupDialogButton : DialogButton
     {
+        /// <summary>
+        /// Whether the dialog should be closed before the action related to this button is invoked.
+        /// </summary>
+        /// <remarks>
+        /// 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.
+        /// </remarks>
+        public virtual bool HideDialogBeforeInvoke => true;
+
         public PopupDialogButton(HoverSampleSet sampleSet = HoverSampleSet.Button)
             : base(sampleSet)
         {
diff --git a/osu.Game/Overlays/DialogOverlay.cs b/osu.Game/Overlays/DialogOverlay.cs
index 2bf38060a7f5..668b6cb428e6 100644
--- a/osu.Game/Overlays/DialogOverlay.cs
+++ b/osu.Game/Overlays/DialogOverlay.cs
@@ -12,18 +12,23 @@
 using System.Linq;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
+using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
 using osu.Framework.Logging;
+using osuTK.Graphics;
 
 namespace osu.Game.Overlays
 {
     public partial class DialogOverlay : OsuFocusedOverlayContainer, IDialogOverlay
     {
+        private readonly Box dimLayer;
         private readonly Container dialogContainer;
 
         protected override string PopInSampleName => "UI/dialog-pop-in";
         protected override string PopOutSampleName => "UI/dialog-pop-out";
 
+        protected override bool DimMainContent => false;
+
         [Resolved]
         private MusicController musicController { get; set; }
 
@@ -43,18 +48,28 @@ public partial class DialogOverlay : OsuFocusedOverlayContainer, IDialogOverlay
 
         public DialogOverlay()
         {
-            AutoSizeAxes = Axes.Y;
+            RelativeSizeAxes = Axes.Both;
 
-            Child = dialogContainer = new Container
+            Child = new Container
             {
-                RelativeSizeAxes = Axes.X,
-                AutoSizeAxes = Axes.Y,
+                RelativeSizeAxes = Axes.Both,
+                Children = new Drawable[]
+                {
+                    dimLayer = new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Colour = Color4.Black,
+                        Alpha = 0.5f,
+                    },
+                    dialogContainer = new Container
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        AutoSizeAxes = Axes.Y,
+                        Width = 500,
+                    },
+                },
             };
-
-            Width = 500;
-
-            Anchor = Anchor.Centre;
-            Origin = Anchor.Centre;
         }
 
         protected override void Dispose(bool isDisposing)
@@ -113,6 +128,23 @@ void dismiss()
 
         protected override bool BlockNonPositionalInput => true;
 
+        private bool closeOnMouseUp;
+
+        protected override bool OnMouseDown(MouseDownEvent e)
+        {
+            closeOnMouseUp = !dialogContainer.ReceivePositionalInputAt(e.ScreenSpaceMousePosition);
+
+            return base.OnMouseDown(e);
+        }
+
+        protected override void OnMouseUp(MouseUpEvent e)
+        {
+            if (closeOnMouseUp && !dialogContainer.ReceivePositionalInputAt(e.ScreenSpaceMousePosition))
+                Hide();
+
+            base.OnMouseUp(e);
+        }
+
         protected override void PopIn()
         {
             duckOperation = musicController?.Duck(new DuckParameters
@@ -121,6 +153,8 @@ protected override void PopIn()
                 DuckDuration = 100,
                 RestoreDuration = 100,
             });
+
+            dimLayer.FadeTo(0.5f, PopupDialog.ENTER_DURATION, Easing.OutQuint);
         }
 
         protected override void PopOut()
@@ -131,6 +165,8 @@ protected override void PopOut()
             // PopOut gets called initially, but we only want to hide dialog when we have been loaded and are present.
             if (IsLoaded && CurrentDialog?.State.Value == Visibility.Visible)
                 CurrentDialog.Hide();
+
+            dimLayer.FadeOut(PopupDialog.EXIT_DURATION, Easing.OutQuint);
         }
 
         public override bool OnPressed(KeyBindingPressEvent<GlobalAction> e)
diff --git a/osu.Game/Overlays/Profile/Header/Components/UserActionsButton.cs b/osu.Game/Overlays/Profile/Header/Components/UserActionsButton.cs
index 90f2a61c7e69..52e9ca5ab58a 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 ReportUserDialog(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/ReportUserDialog.cs
similarity index 84%
rename from osu.Game/Overlays/Profile/ReportUserPopover.cs
rename to osu.Game/Overlays/Profile/ReportUserDialog.cs
index c04d76bd9025..b8f7a7d25020 100644
--- a/osu.Game/Overlays/Profile/ReportUserPopover.cs
+++ b/osu.Game/Overlays/Profile/ReportUserDialog.cs
@@ -9,11 +9,11 @@
 
 namespace osu.Game.Overlays.Profile
 {
-    public partial class ReportUserPopover : ReportPopover<UserReportReason>
+    public partial class ReportUserDialog : ReportDialog<UserReportReason>
     {
         private readonly APIUser user;
 
-        public ReportUserPopover(APIUser user)
+        public ReportUserDialog(APIUser user)
             : base(ReportStrings.UserTitle(user.Username))
         {
             this.user = user;