diff --git a/src/Perspex.Controls/Mixins/ContentControlMixin.cs b/src/Perspex.Controls/Mixins/ContentControlMixin.cs
index e19cc17ae2..2435a266f7 100644
--- a/src/Perspex.Controls/Mixins/ContentControlMixin.cs
+++ b/src/Perspex.Controls/Mixins/ContentControlMixin.cs
@@ -59,6 +59,8 @@ namespace Perspex.Controls.Mixins
 
                     if (presenter != null)
                     {
+                        presenter.ApplyTemplate();
+
                         var logicalChildren = logicalChildrenSelector(sender);
                         var subscription = presenter
                             .GetObservable(ContentPresenter.ChildProperty)
diff --git a/tests/Perspex.Controls.UnitTests/ContentControlTests.cs b/tests/Perspex.Controls.UnitTests/ContentControlTests.cs
index a74eabe9e7..a8fc9d124c 100644
--- a/tests/Perspex.Controls.UnitTests/ContentControlTests.cs
+++ b/tests/Perspex.Controls.UnitTests/ContentControlTests.cs
@@ -54,7 +54,6 @@ namespace Perspex.Controls.UnitTests
                 root.Child = target;
 
                 target.ApplyTemplate();
-                target.Presenter.UpdateChild();
 
                 styler.Verify(x => x.ApplyStyles(It.IsAny<ContentControl>()), Times.Once());
                 styler.Verify(x => x.ApplyStyles(It.IsAny<Border>()), Times.Once());