diff --git a/crates/gpui/src/elements/div.rs b/crates/gpui/src/elements/div.rs
index ad6d7a162c1499bca635cd0039e89cd4bcf00dbd..f76f1c702e7c6046beb2e2061f939da028d4293f 100644
--- a/crates/gpui/src/elements/div.rs
+++ b/crates/gpui/src/elements/div.rs
@@ -1866,6 +1866,11 @@ impl Interactivity {
                 });
             }
 
+            // Ensure to remove active tooltip if tooltip builder is none
+            if self.tooltip_builder.is_none() {
+                element_state.active_tooltip.take();
+            }
+
             if let Some(tooltip_builder) = self.tooltip_builder.take() {
                 let tooltip_is_hoverable = tooltip_builder.hoverable;
                 let active_tooltip = element_state