From 155065e932fd21a3d3301996875c8bb49be2c54b Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@users.noreply.github.com>
Date: Mon, 25 Sep 2023 22:30:08 +0200
Subject: [PATCH] Remove control child from logical children.

Fixes test in previous commit.

Co-Authored-By: Jan Kristian Bjerke <956218+jankrib@users.noreply.github.com>
---
 src/Avalonia.Controls/Presenters/PanelContainerGenerator.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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);
                     }
                 }