diff --git a/src/xenia/app/profile_dialogs.cc b/src/xenia/app/profile_dialogs.cc
index 2b0bbf717..9817db26b 100644
--- a/src/xenia/app/profile_dialogs.cc
+++ b/src/xenia/app/profile_dialogs.cc
@@ -183,7 +183,11 @@ void ProfileConfigDialog::OnDraw(ImGuiIO& io) {
     const uint8_t user_index =
         profile_manager->GetUserIndexAssignedToProfile(xuid);
 
-    DrawProfileContent(xuid, user_index, &account);
+    if (!DrawProfileContent(xuid, user_index, &account)) {
+      ImGui::PopID();
+      ImGui::End();
+      return;
+    }
 
     ImGui::PopID();
     ImGui::Spacing();