diff --git a/main/gui/source/window/window.cpp b/main/gui/source/window/window.cpp
index 838d2e613..056a59865 100644
--- a/main/gui/source/window/window.cpp
+++ b/main/gui/source/window/window.cpp
@@ -491,7 +491,7 @@ namespace hex {
                     ImGui::OpenPopup(name);
                 }
 
-                if (currPopup->shouldClose()) {
+                if (currPopup->shouldClose() || !open) {
                     log::debug("Closing popup '{}'", name);
                     positionSet = sizeSet = false;