diff --git a/imgui.cpp b/imgui.cpp
index bd0ec45aa..a1ab36ebc 100644
--- a/imgui.cpp
+++ b/imgui.cpp
@@ -3005,7 +3005,8 @@ static void ImGui::NavUpdate()
         else if (g.OpenPopupStack.Size > 0)
         {
             // Close open popup/menu
-            ClosePopupToLevel(g.OpenPopupStack.Size - 1);
+            if (!(g.OpenPopupStack.back().Window->Flags & ImGuiWindowFlags_Modal))
+                ClosePopupToLevel(g.OpenPopupStack.Size - 1);
         }
         else if (g.NavLayer != 0)
         {