diff --git a/src/Shared/HandyControl_Shared/Controls/Panel/Grid/Row.cs b/src/Shared/HandyControl_Shared/Controls/Panel/Grid/Row.cs
index 3b4bd3ce4..50ff13889 100644
--- a/src/Shared/HandyControl_Shared/Controls/Panel/Grid/Row.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Panel/Grid/Row.cs
@@ -88,7 +88,9 @@ protected override Size ArrangeOverride(Size finalSize)
 
         foreach (var child in cols)
         {
-            if (!child.IsVisible)
+            // Check the local Visibility, not IsVisible: Cols skipped while the hosting
+            // window is hidden can never recover their layout once it is shown again.
+            if (child.Visibility != Visibility.Visible)
             {
                 continue;
             }