diff --git a/src/Avalonia.Controls/Window.cs b/src/Avalonia.Controls/Window.cs
index aa0ce50bad..1ff08f0169 100644
--- a/src/Avalonia.Controls/Window.cs
+++ b/src/Avalonia.Controls/Window.cs
@@ -567,30 +567,39 @@ namespace Avalonia.Controls
         /// </summary>
         public override void Hide()
         {
-            if (!_shown)
+            try
             {
-                return;
-            }
+                IgnoreVisibilityChange = true;
+                
+                if (!_shown)
+                {
+                    return;
+                }
 
-            Renderer?.Stop();
+                Renderer?.Stop();
 
-            if (Owner is Window owner)
-            {
-                owner.RemoveChild(this);
-            }
+                if (Owner is Window owner)
+                {
+                    owner.RemoveChild(this);
+                }
 
-            if (_children.Count > 0)
-            {
-                foreach (var child in _children.ToArray())
+                if (_children.Count > 0)
                 {
-                    child.child.Hide();
+                    foreach (var child in _children.ToArray())
+                    {
+                        child.child.Hide();
+                    }
                 }
-            }
 
-            Owner = null;
-            PlatformImpl?.Hide();
-            IsVisible = false;
-            _shown = false;
+                Owner = null;
+                PlatformImpl?.Hide();
+                IsVisible = false;
+                _shown = false;
+            }
+            finally
+            {
+                IgnoreVisibilityChange = false;
+            }
         }
 
         /// <summary>