diff --git a/docs/CHANGELOG.txt b/docs/CHANGELOG.txt
index bd7715e2c..d3e44bf14 100644
--- a/docs/CHANGELOG.txt
+++ b/docs/CHANGELOG.txt
@@ -175,6 +175,8 @@ Other Changes:
   noticeable by user but detected by sanitizers). (#9089) [@judicaelclair]
 - InvisibleButton: allow calling with size (0,0) to fit to available content 
   size. (#9166, #7623)
+- Tooltips, Disabled: fixed EndDisabledOverrideReenable() assertion when
+  nesting a tooltip in a disabled block. (#9180, #7640) [@RegimantasSimkus]
 - Added GetItemFlags() in public API for consistency and to expose generic
   flags of last submitted item. (#9127)
 - Images:
diff --git a/imgui.cpp b/imgui.cpp
index 12c51ccb1..6f7738195 100644
--- a/imgui.cpp
+++ b/imgui.cpp
@@ -8259,8 +8259,8 @@ void ImGui::BeginDisabledOverrideReenable()
 void ImGui::EndDisabledOverrideReenable()
 {
     ImGuiContext& g = *GImGui;
-    g.DisabledStackSize--;
     IM_ASSERT(g.DisabledStackSize > 0);
+    g.DisabledStackSize--;
     g.ItemFlagsStack.pop_back();
     g.CurrentItemFlags = g.ItemFlagsStack.back();
     g.Style.Alpha = g.CurrentWindowStack.back().DisabledOverrideReenableAlphaBackup;