diff --git a/imgui.cpp b/imgui.cpp
index e9795c8d..e3b41300 100644
--- a/imgui.cpp
+++ b/imgui.cpp
@@ -2832,6 +2832,7 @@ static void ImGui::NavUpdateWindowing()
         g.NavDisableHighlight = false;
         g.NavDisableMouseHover = true;
         apply_focus_window = NavRestoreLastChildNavWindow(apply_focus_window);
+        CloseInactivePopups(apply_focus_window);
         FocusWindow(apply_focus_window);
         if (apply_focus_window->NavLastIds[0] == 0)
             NavInitWindow(apply_focus_window, false);