diff --git a/crates/gpui/src/elements/div.rs b/crates/gpui/src/elements/div.rs
index d9b2329658..6979b58567 100644
--- a/crates/gpui/src/elements/div.rs
+++ b/crates/gpui/src/elements/div.rs
@@ -1869,6 +1869,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