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()