diff --git a/src/Ursa/Controls/OverlayShared/OverlayDialogHost.Shared.cs b/src/Ursa/Controls/OverlayShared/OverlayDialogHost.Shared.cs
index 2d768ca..4f30375 100644
--- a/src/Ursa/Controls/OverlayShared/OverlayDialogHost.Shared.cs
+++ b/src/Ursa/Controls/OverlayShared/OverlayDialogHost.Shared.cs
@@ -126,6 +126,10 @@ public partial class OverlayDialogHost: Canvas
     
     protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e)
     {
+        while (_layers.Count>0)
+        {
+            _layers[0].Element.Close();
+        }
         OverlayDialogManager.UnregisterHost(HostId);
         base.OnDetachedFromVisualTree(e);
     }