diff --git a/src/Shared/HandyControl_Shared/Controls/Other/NotifyIcon.cs b/src/Shared/HandyControl_Shared/Controls/Other/NotifyIcon.cs
index 0b472959..6f196d76 100644
--- a/src/Shared/HandyControl_Shared/Controls/Other/NotifyIcon.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Other/NotifyIcon.cs
@@ -582,8 +582,10 @@ namespace HandyControl.Controls
             {
                 if (msg == _wmTaskbarCreated)
                 {
-                    _added = false;
-                    UpdateIcon(true);
+                    if (_messageWindowHandle == hWnd && Visibility == Visibility.Visible)
+                    {
+                        UpdateIcon(true);
+                    }
                 }
                 else
                 {