From a310d3a5e714d1050c429a9c111a3e0f6eb2b79e Mon Sep 17 00:00:00 2001
From: Stenzek <stenzek@gmail.com>
Date: Wed, 9 Apr 2025 22:47:04 +1000
Subject: [PATCH] FullscreenUI: Fix load-and-resume-state HC popup

---
 src/core/fullscreen_ui.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/core/fullscreen_ui.cpp b/src/core/fullscreen_ui.cpp
index 46d989459..705e0082e 100644
--- a/src/core/fullscreen_ui.cpp
+++ b/src/core/fullscreen_ui.cpp
@@ -1165,8 +1165,12 @@ void FullscreenUI::SwitchToMainWindow(MainWindowType type)
     return;
 
   s_state.current_main_window = type;
-  ImGui::SetWindowFocus(nullptr);
-  QueueResetFocus(FocusResetType::ViewChanged);
+  if (!AreAnyDialogsOpen())
+  {
+    ImGui::SetWindowFocus(nullptr);
+    QueueResetFocus(FocusResetType::ViewChanged);
+  }
+
   UpdateRunIdleState();
   FixStateIfPaused();
 }