diff --git a/src/Avalonia.Controls/Grid.cs b/src/Avalonia.Controls/Grid.cs
index db145b4348..2e745cd364 100644
--- a/src/Avalonia.Controls/Grid.cs
+++ b/src/Avalonia.Controls/Grid.cs
@@ -2325,7 +2325,7 @@ namespace Avalonia.Controls
 
             if ((!ShowGridLines) && (_gridLinesRenderer != null))
             {
-                VisualChildren.Add(_gridLinesRenderer);
+                VisualChildren.Remove(_gridLinesRenderer);
                 _gridLinesRenderer = null;
             }
 
@@ -2357,7 +2357,7 @@ namespace Avalonia.Controls
             if (grid._extData != null    // trivial grid is 1 by 1. there is no grid lines anyway
                 && grid.ListenToNotifications)
             {
-                grid.InvalidateVisual();
+                grid.InvalidateArrange();
             }
 
             grid.SetFlags((bool)e.NewValue!, Flags.ShowGridLinesPropertyValue);