1 files changed, 4 insertions, 0 deletions
diff --git a/Ryujinx.Ava/Ui/Controls/ContentDialogHelper.cs b/Ryujinx.Ava/Ui/Controls/ContentDialogHelper.cs
index 2794a815..8dd1afaf 100644
--- a/Ryujinx.Ava/Ui/Controls/ContentDialogHelper.cs
+++ b/Ryujinx.Ava/Ui/Controls/ContentDialogHelper.cs
@@ -97,10 +97,12 @@ namespace Ryujinx.Ava.Ui.Controls
                 });
                 contentDialog.SecondaryButtonCommand = MiniCommand.Create(() =>
                 {
+                    contentDialog.PrimaryButtonClick -= DeferClose;
                     result = UserResult.No;
                 });
                 contentDialog.CloseButtonCommand = MiniCommand.Create(() =>
                 {
+                    contentDialog.PrimaryButtonClick -= DeferClose;
                     result = UserResult.Cancel;
                 });
                 await contentDialog.ShowAsync(ContentDialogPlacement.Popup);
@@ -115,6 +117,8 @@ namespace Ryujinx.Ava.Ui.Controls
                     return;
                 }
 
+                contentDialog.PrimaryButtonClick -= DeferClose;
+
                 startedDeferring = true;
 
                 var deferral = args.GetDeferral();