diff --git a/Perspex/Controls/TreeViewItem.cs b/Perspex/Controls/TreeViewItem.cs
index b2ab2bbd42..1a383e30fe 100644
--- a/Perspex/Controls/TreeViewItem.cs
+++ b/Perspex/Controls/TreeViewItem.cs
@@ -34,7 +34,7 @@ namespace Perspex.Controls
         protected override void OnAttachedToVisualTree()
         {
             base.OnAttachedToVisualTree();
-            this.parent = this.GetVisualParent<Control>().TemplatedParent as TreeView;
+            this.parent = this.GetVisualAncestor<TreeView>();
         }
     }
 }
diff --git a/Perspex/Themes/Default/TreeViewItemStyle.cs b/Perspex/Themes/Default/TreeViewItemStyle.cs
index 31c5cab537..c3a3b1d099 100644
--- a/Perspex/Themes/Default/TreeViewItemStyle.cs
+++ b/Perspex/Themes/Default/TreeViewItemStyle.cs
@@ -70,14 +70,17 @@ namespace Perspex.Themes.Default
 
         private Control ToggleButtonTemplate(ToggleButton control)
         {
-            return new Path
+            return new Border
             {
-                Fill = Brushes.Black,
-                Stroke = Brushes.Black,
-                StrokeThickness = 1,
-                Margin = new Thickness(3, 0),
-                VerticalAlignment = Layout.VerticalAlignment.Center,
-                Data = StreamGeometry.Parse("M 0 2 L 4 6 L 0 10 Z"),
+                Content = new Path
+                {
+                    Fill = Brushes.Black,
+                    Stroke = Brushes.Black,
+                    StrokeThickness = 1,
+                    Margin = new Thickness(3, 0),
+                    VerticalAlignment = Layout.VerticalAlignment.Center,
+                    Data = StreamGeometry.Parse("M 0 2 L 4 6 L 0 10 Z"),
+                }
             };
         }
     }