diff --git a/src/Avalonia.Controls/Presenters/PanelContainerGenerator.cs b/src/Avalonia.Controls/Presenters/PanelContainerGenerator.cs
index 999c6db1bd..cba729d9d2 100644
--- a/src/Avalonia.Controls/Presenters/PanelContainerGenerator.cs
+++ b/src/Avalonia.Controls/Presenters/PanelContainerGenerator.cs
@@ -68,9 +68,10 @@ namespace Avalonia.Controls.Presenters
                 {
                     var c = children[index + i];
 
+                    itemsControl.RemoveLogicalChild(children[i + index]);
+
                     if (!c.IsSet(ItemIsOwnContainerProperty))
                     {
-                        itemsControl.RemoveLogicalChild(children[i + index]);
                         generator.ClearItemContainer(c);
                     }
                 }