diff --git a/src/Avalonia.Controls/TopLevel.cs b/src/Avalonia.Controls/TopLevel.cs
index c738a5ff3b..b4e33e6631 100644
--- a/src/Avalonia.Controls/TopLevel.cs
+++ b/src/Avalonia.Controls/TopLevel.cs
@@ -348,6 +348,7 @@ namespace Avalonia.Controls
             OnClosed(EventArgs.Empty);
             Renderer?.Dispose();
             Renderer = null;
+            LayoutManager?.Dispose();
         }
 
         /// <summary>
diff --git a/src/Avalonia.Layout/ILayoutManager.cs b/src/Avalonia.Layout/ILayoutManager.cs
index 688b6b83e5..d996b301f8 100644
--- a/src/Avalonia.Layout/ILayoutManager.cs
+++ b/src/Avalonia.Layout/ILayoutManager.cs
@@ -7,7 +7,7 @@ namespace Avalonia.Layout
     /// <summary>
     /// Manages measuring and arranging of controls.
     /// </summary>
-    public interface ILayoutManager
+    public interface ILayoutManager : IDisposable
     {
         /// <summary>
         /// Raised when the layout manager completes a layout pass.
diff --git a/src/Avalonia.Layout/LayoutManager.cs b/src/Avalonia.Layout/LayoutManager.cs
index 8f964a6041..c923aa62e9 100644
--- a/src/Avalonia.Layout/LayoutManager.cs
+++ b/src/Avalonia.Layout/LayoutManager.cs
@@ -10,12 +10,13 @@ namespace Avalonia.Layout
     /// <summary>
     /// Manages measuring and arranging of controls.
     /// </summary>
-    public class LayoutManager : ILayoutManager
+    public class LayoutManager : ILayoutManager, IDisposable
     {
         private readonly ILayoutRoot _owner;
         private readonly LayoutQueue<ILayoutable> _toMeasure = new LayoutQueue<ILayoutable>(v => !v.IsMeasureValid);
         private readonly LayoutQueue<ILayoutable> _toArrange = new LayoutQueue<ILayoutable>(v => !v.IsArrangeValid);
         private readonly Action _executeLayoutPass;
+        private bool _disposed;
         private bool _queued;
         private bool _running;
 
@@ -33,6 +34,11 @@ namespace Avalonia.Layout
             control = control ?? throw new ArgumentNullException(nameof(control));
             Dispatcher.UIThread.VerifyAccess();
 
+            if (_disposed)
+            {
+                return;
+            }
+
             if (!control.IsAttachedToVisualTree)
             {
 #if DEBUG
@@ -59,6 +65,11 @@ namespace Avalonia.Layout
             control = control ?? throw new ArgumentNullException(nameof(control));
             Dispatcher.UIThread.VerifyAccess();
 
+            if (_disposed)
+            {
+                return;
+            }
+
             if (!control.IsAttachedToVisualTree)
             {
 #if DEBUG
@@ -85,7 +96,7 @@ namespace Avalonia.Layout
 
             Dispatcher.UIThread.VerifyAccess();
 
-            if (!_owner.IsVisible)
+            if (_disposed)
             {
                 return;
             }
@@ -150,6 +161,11 @@ namespace Avalonia.Layout
         /// <inheritdoc/>
         public virtual void ExecuteInitialLayoutPass()
         {
+            if (_disposed)
+            {
+                return;
+            }
+
             try
             {
                 _running = true;
@@ -179,6 +195,13 @@ namespace Avalonia.Layout
             ExecuteInitialLayoutPass();
         }
 
+        public void Dispose()
+        {
+            _disposed = true;
+            _toMeasure.Dispose();
+            _toArrange.Dispose();
+        }
+
         private void ExecuteMeasurePass()
         {
             while (_toMeasure.Count > 0)
@@ -256,7 +279,7 @@ namespace Avalonia.Layout
 
         private void QueueLayoutPass()
         {
-            if (!_queued && !_running && _owner.IsVisible)
+            if (!_queued && !_running)
             {
                 Dispatcher.UIThread.Post(_executeLayoutPass, DispatcherPriority.Layout);
                 _queued = true;
diff --git a/src/Avalonia.Layout/LayoutQueue.cs b/src/Avalonia.Layout/LayoutQueue.cs
index e261a1b48e..1a9eb6b785 100644
--- a/src/Avalonia.Layout/LayoutQueue.cs
+++ b/src/Avalonia.Layout/LayoutQueue.cs
@@ -4,7 +4,7 @@ using System.Collections.Generic;
 
 namespace Avalonia.Layout
 {
-    internal class LayoutQueue<T> : IReadOnlyCollection<T>
+    internal class LayoutQueue<T> : IReadOnlyCollection<T>, IDisposable
     {
         private struct Info
         {
@@ -84,5 +84,12 @@ namespace Avalonia.Layout
 
             _notFinalizedBuffer.Clear();
         }
+
+        public void Dispose()
+        {
+            _inner.Clear();
+            _loopQueueInfo.Clear();
+            _notFinalizedBuffer.Clear();
+        }
     }
 }
diff --git a/tests/Avalonia.Controls.UnitTests/TopLevelTests.cs b/tests/Avalonia.Controls.UnitTests/TopLevelTests.cs
index ab272b261b..e49e273bec 100644
--- a/tests/Avalonia.Controls.UnitTests/TopLevelTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/TopLevelTests.cs
@@ -267,6 +267,23 @@ namespace Avalonia.Controls.UnitTests
             }
         }
 
+        [Fact]
+        public void Close_Should_Dispose_LayoutManager()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var impl = new Mock<ITopLevelImpl>();
+                impl.SetupAllProperties();
+
+                var layoutManager = new Mock<ILayoutManager>();
+                var target = new TestTopLevel(impl.Object, layoutManager.Object);
+
+                impl.Object.Closed();
+
+                layoutManager.Verify(x => x.Dispose());
+            }
+        }
+
         [Fact]
         public void Reacts_To_Changes_In_Global_Styles()
         {