diff --git a/src/Avalonia.Controls/ToolTipService.cs b/src/Avalonia.Controls/ToolTipService.cs
index 569697304f..587bbb6aa6 100644
--- a/src/Avalonia.Controls/ToolTipService.cs
+++ b/src/Avalonia.Controls/ToolTipService.cs
@@ -29,6 +29,7 @@ namespace Avalonia.Controls
                 control.PointerEnter -= ControlPointerEnter;
                 control.PointerLeave -= ControlPointerLeave;
                 control.DetachedFromVisualTree -= ControlDetaching;
+                Close(control);
             }
 
             if (e.NewValue != null)