diff --git a/imgui.cpp b/imgui.cpp
index dc501d46..2a5195fe 100644
--- a/imgui.cpp
+++ b/imgui.cpp
@@ -2462,6 +2462,7 @@ void ImGui::Shutdown()
     g.WindowsSortBuffer.clear();
     g.CurrentWindow = NULL;
     g.CurrentWindowStack.clear();
+    g.WindowsById.Clear();
     g.NavWindow = NULL;
     g.HoveredWindow = NULL;
     g.HoveredRootWindow = NULL;