diff --git a/Perspex.Diagnostics/DevTools.cs b/Perspex.Diagnostics/DevTools.cs
index 0fa9c56ca1..9eab4ca360 100644
--- a/Perspex.Diagnostics/DevTools.cs
+++ b/Perspex.Diagnostics/DevTools.cs
@@ -59,10 +59,10 @@ namespace Perspex.Diagnostics
             TextBlock result = new TextBlock();
             result.Text = node.Type;
 
-            //if (control != null && control.TemplatedParent != null)
-            //{
-            //    result.FontStyle = Media.FontStyle.Italic;
-            //}
+            if (node.IsInTemplate)
+            {
+                result.FontStyle = Media.FontStyle.Italic;
+            }
 
             return result;
         }
diff --git a/Perspex.Diagnostics/ViewModels/VisualTreeNode.cs b/Perspex.Diagnostics/ViewModels/VisualTreeNode.cs
index 43238c1c48..411c0d14fc 100644
--- a/Perspex.Diagnostics/ViewModels/VisualTreeNode.cs
+++ b/Perspex.Diagnostics/ViewModels/VisualTreeNode.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Perspex.Controls;
 using ReactiveUI;
 
 namespace Perspex.Diagnostics.ViewModels
@@ -13,10 +14,19 @@ namespace Perspex.Diagnostics.ViewModels
         {
             this.Children = visual.VisualChildren.CreateDerivedCollection(x => new VisualTreeNode(x));
             this.Type = visual.GetType().Name;
+
+            Control control = visual as Control;
+
+            if (control != null)
+            {
+                this.IsInTemplate = control.TemplatedParent != null;
+            }
         }
 
         public IReactiveDerivedList<VisualTreeNode> Children { get; private set; }
 
+        public bool IsInTemplate { get; private set; }
+
         public string Type { get; private set; }
     }
 }