diff --git a/docs/CHANGELOG.txt b/docs/CHANGELOG.txt
index ab7deda0..d1afddb2 100644
--- a/docs/CHANGELOG.txt
+++ b/docs/CHANGELOG.txt
@@ -44,6 +44,7 @@ Other Changes:
 - Scrolling: Fix mouse wheel axis swap when using SHIFT on macOS (system already does it). (#4010)
 - Window: Fix IsWindowAppearing() from returning true twice in most cases. (#3982, #1497, #1061)
 - Nav: Fixed using SetItemDefaultFocus() on windows with _NavFlattened flag.
+- Nav: Fixed toggling menu layer while an InputText() is active not stealing active id.
 - Tables: Expose TableSetColumnEnabled() in public api. (#3935)
 - Tables: Better preserve widths when columns count changes. (#4046)
 - TabBar: Fixed mouse reordering with very fast movements (e.g. crossing multiple tabs in a single
diff --git a/imgui.cpp b/imgui.cpp
index 00f69a05..4d3abac2 100644
--- a/imgui.cpp
+++ b/imgui.cpp
@@ -9648,6 +9648,8 @@ static void ImGui::NavUpdateWindowing()
     // Apply menu/layer toggle
     if (apply_toggle_layer && g.NavWindow)
     {
+        ClearActiveID();
+
         // Move to parent menu if necessary
         ImGuiWindow* new_nav_window = g.NavWindow;
         while (new_nav_window->ParentWindow