diff --git a/Perspex.Controls/ControlExtensions.cs b/Perspex.Controls/ControlExtensions.cs
index e1b400365a..dd9e03c5d7 100644
--- a/Perspex.Controls/ControlExtensions.cs
+++ b/Perspex.Controls/ControlExtensions.cs
@@ -28,11 +28,11 @@ namespace Perspex.Controls
             return GetTemplateControls(control, (IVisual)control);
         }
 
-        public static IEnumerable<Control> GetTemplateControls(ITemplatedControl templated, IVisual parent)
+        private static IEnumerable<Control> GetTemplateControls(ITemplatedControl templated, IVisual parent)
         {
             IVisual visual = parent as IVisual;
 
-            foreach (var child in visual.VisualChildren.OfType<Control>().Where(x => x.TemplatedParent != null))
+            foreach (var child in visual.VisualChildren.OfType<Control>().Where(x => x.TemplatedParent == templated))
             {
                 yield return child;