From d5e0634cc7a654931ef8da338c93cccb317d7c9b Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Wed, 29 Jul 2020 14:28:52 -0300
Subject: [PATCH] force tooltip to close if the datacontext and therefore the
 tip property change.

---
 src/Avalonia.Controls/ToolTipService.cs | 1 +
 1 file changed, 1 insertion(+)

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)