From dac0da2caca437fff28ed64976f9ff53383ba7b4 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Sat, 12 Nov 2016 19:49:18 +0000
Subject: [PATCH] Corrected logic for materialize methods.

---
 src/Avalonia.Controls/ItemsControl.cs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/Avalonia.Controls/ItemsControl.cs b/src/Avalonia.Controls/ItemsControl.cs
index 1ddec7ac85..5b135a144d 100644
--- a/src/Avalonia.Controls/ItemsControl.cs
+++ b/src/Avalonia.Controls/ItemsControl.cs
@@ -239,11 +239,16 @@ namespace Avalonia.Controls
                     {
                         var containerControl = container.ContainerControl as ContentPresenter;
 
-                        if (containerControl != null && containerControl.Child != null && containerControl.Child is ILogical)
+                        if (containerControl != null)
                         {
                             ((ISetLogicalParent)containerControl).SetParent(this);
                             containerControl.UpdateChild();
-                            LogicalChildren.Add(containerControl.Child as ILogical);
+
+                            if (containerControl.Child != null && containerControl.Child is ILogical)
+                            {
+                                LogicalChildren.Add(containerControl.Child as ILogical);
+                            }
+
                             containerControl.SetValue(TemplatedParentProperty, null);
                         }
                         else