diff --git a/main/gui/source/window/window.cpp b/main/gui/source/window/window.cpp
index 1aaa85c0e..1dab169a7 100644
--- a/main/gui/source/window/window.cpp
+++ b/main/gui/source/window/window.cpp
@@ -549,6 +549,8 @@ namespace hex {
                         }
                     }
                 }
+            } else {
+                popupClosed = true;
             }
 
             if (currPopup != nullptr) {
diff --git a/plugins/builtin/source/content/events.cpp b/plugins/builtin/source/content/events.cpp
index 790085d51..4ba26fd05 100644
--- a/plugins/builtin/source/content/events.cpp
+++ b/plugins/builtin/source/content/events.cpp
@@ -365,6 +365,9 @@ namespace hex::plugin::builtin {
             static ImGuiWindow *lastFocusedWindow = nullptr;
 
             if (focused) {
+                if (lastFocusedWindow == nullptr)
+                    return;
+
                 // If the main window gains focus again, restore the last focused window
                 ImGui::FocusWindow(lastFocusedWindow);
                 ImGui::FocusWindow(lastFocusedWindow, ImGuiFocusRequestFlags_RestoreFocusedChild);
@@ -373,10 +376,13 @@ namespace hex::plugin::builtin {
                     log::debug("Restoring focus on window '{}'", lastFocusedWindow->Name ? lastFocusedWindow->Name : "Unknown Window");
                 lastFocusedWindow = nullptr;
             } else {
+                if (ctx->NavWindow != nullptr && (ctx->NavWindow->Flags & ImGuiWindowFlags_Modal))
+                    return;
+
                 // If the main window loses focus, store the currently focused window
                 // and remove focus from it so it doesn't look like it's focused and
                 // cursor blink animations don't play
-                lastFocusedWindow =  ctx->NavWindow;
+                lastFocusedWindow = ctx->NavWindow;
                 ImGui::FocusWindow(nullptr);
 
                 if (lastFocusedWindow != nullptr)