diff --git a/Perspex.Controls/ControlExtensions.cs b/Perspex.Controls/ControlExtensions.cs
index 4fb516d0c2..56cc5e86cc 100644
--- a/Perspex.Controls/ControlExtensions.cs
+++ b/Perspex.Controls/ControlExtensions.cs
@@ -31,7 +31,6 @@ namespace Perspex.Controls
             {
                 return visual.GetVisualDescendents()
                     .OfType<Control>()
-                    .TakeWhile(x => x.TemplatedParent != null)
                     .Where(x => x.TemplatedParent == control);
             }
             else