diff --git a/src/Shared/HandyControl_Shared/Controls/Growl/Growl.cs b/src/Shared/HandyControl_Shared/Controls/Growl/Growl.cs
index 855a768c..d3d0996c 100644
--- a/src/Shared/HandyControl_Shared/Controls/Growl/Growl.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Growl/Growl.cs
@@ -439,8 +439,19 @@ public class Growl : Control
 
     private static Panel CreateDefaultPanel()
     {
-        FrameworkElement element = WindowHelper.GetActiveWindow();
-        var decorator = VisualHelper.GetChild<AdornerDecorator>(element);
+       var win = WindowHelper.GetActiveWindow();
+        win.Closed+= (s, e) =>
+        {
+            if (GrowlPanel != null)
+            {
+                foreach (var item in GrowlPanel.Children.OfType<Growl>())
+                {
+                    item.Close(false);
+                }
+                GrowlPanel = null;
+            }
+        };
+        var decorator = VisualHelper.GetChild<AdornerDecorator>(win);
 
         var layer = decorator?.AdornerLayer;
         if (layer == null)