diff --git a/src/xenia/app/emulator_window.cc b/src/xenia/app/emulator_window.cc
index 9764a6be4..b61b4a6a8 100644
--- a/src/xenia/app/emulator_window.cc
+++ b/src/xenia/app/emulator_window.cc
@@ -703,7 +703,8 @@ void EmulatorWindow::XMPConfigDialog::OnDraw(ImGuiIO& io) {
   ImGui::End();
 
   if (!dialog_open) {
-    emulator_window_.ToggleXMPConfigDialog();
+    Close();
+    emulator_window_.xmp_config_dialog_.release();
     return;
   }
 }
diff --git a/src/xenia/app/profile_dialogs.cc b/src/xenia/app/profile_dialogs.cc
index 67148cc6b..a62265f84 100644
--- a/src/xenia/app/profile_dialogs.cc
+++ b/src/xenia/app/profile_dialogs.cc
@@ -29,7 +29,7 @@ void NoProfileDialog::OnDraw(ImGuiIO& io) {
                              ->profile_manager();
 
   if (profile_manager->GetAccountCount()) {
-    delete this;
+    Close();
     return;
   }