diff --git a/imgui.cpp b/imgui.cpp
index da8c6df2b..5b2a68302 100644
--- a/imgui.cpp
+++ b/imgui.cpp
@@ -4482,7 +4482,7 @@ ImGuiWindow* ImGui::FindBottomMostVisibleWindowWithinBeginStack(ImGuiWindow* par
             continue;
         if (!IsWindowWithinBeginStackOf(window, parent_window))
             break;
-        if (IsWindowActiveAndVisible(window))
+        if (IsWindowActiveAndVisible(window) && GetWindowDisplayLayer(window) <= GetWindowDisplayLayer(parent_window))
             bottom_most_visible_window = window;
     }
     return bottom_most_visible_window;
diff --git a/imgui.h b/imgui.h
index d9c29ab45..60e578202 100644
--- a/imgui.h
+++ b/imgui.h
@@ -64,7 +64,7 @@ Index of this file:
 // Version
 // (Integer encoded as XYYZZ for use in #if preprocessor conditionals. Work in progress versions typically starts at XYY99 then bounce up to XYY00, XYY01 etc. when release tagging happens)
 #define IMGUI_VERSION               "1.86 WIP"
-#define IMGUI_VERSION_NUM           18517
+#define IMGUI_VERSION_NUM           18518
 #define IMGUI_CHECKVERSION()        ImGui::DebugCheckVersionAndDataLayout(IMGUI_VERSION, sizeof(ImGuiIO), sizeof(ImGuiStyle), sizeof(ImVec2), sizeof(ImVec4), sizeof(ImDrawVert), sizeof(ImDrawIdx))
 #define IMGUI_HAS_TABLE