From 1c5d0485436a4097f7bd5e8f385db5c4d0767a4b Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Mon, 11 May 2020 22:26:29 +0200
Subject: [PATCH] Only do a node cleanup when all operations have finished.

Fixes #3918.
---
 src/Avalonia.Controls/SelectionModel.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Avalonia.Controls/SelectionModel.cs b/src/Avalonia.Controls/SelectionModel.cs
index d930edc529..e8958438f1 100644
--- a/src/Avalonia.Controls/SelectionModel.cs
+++ b/src/Avalonia.Controls/SelectionModel.cs
@@ -808,7 +808,11 @@ namespace Avalonia.Controls
             }
 
             OnSelectionChanged(e);
-            _rootNode.Cleanup();
+
+            if (_operationCount == 0)
+            {
+                _rootNode.Cleanup();
+            }
         }
 
         private void ApplyAutoSelect()