diff --git a/src/Avalonia.Controls/TreeViewItem.cs b/src/Avalonia.Controls/TreeViewItem.cs
index ec1e943da0..8ef0131b19 100644
--- a/src/Avalonia.Controls/TreeViewItem.cs
+++ b/src/Avalonia.Controls/TreeViewItem.cs
@@ -191,13 +191,14 @@ namespace Avalonia.Controls
                     return;
                 }
 
-                if (_header != null)
+                var header = _headerPresenter ?? _header;
+                if (header is not null)
                 {
-                    var m = _header.TransformToVisual(this);
+                    var m = header.TransformToVisual(this);
 
                     if (m.HasValue)
                     {
-                        var bounds = new Rect(_header.Bounds.Size);
+                        var bounds = new Rect(header.Bounds.Size);
                         var rect = bounds.TransformToAABB(m.Value);
                         e.TargetRect = rect;
                     }
diff --git a/src/Avalonia.Themes.Fluent/Controls/TreeViewItem.xaml b/src/Avalonia.Themes.Fluent/Controls/TreeViewItem.xaml
index a1b22528c9..e242c0988d 100644
--- a/src/Avalonia.Themes.Fluent/Controls/TreeViewItem.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/TreeViewItem.xaml
@@ -73,7 +73,7 @@
                   MinHeight="{TemplateBinding MinHeight}"
                   TemplatedControl.IsTemplateFocusTarget="True">
             <Grid Name="PART_Header"
-                  ColumnDefinitions="Auto, *">
+                  ColumnDefinitions="Auto, Auto">
               <Grid.Margin>
                 <MultiBinding Converter="{x:Static converters:TreeViewItemIndentConverter.Instance}">
                   <Binding Path="Level" RelativeSource="{RelativeSource TemplatedParent}" />
diff --git a/src/Avalonia.Themes.Simple/Controls/TreeViewItem.xaml b/src/Avalonia.Themes.Simple/Controls/TreeViewItem.xaml
index b16e69d4c9..1513166dfa 100644
--- a/src/Avalonia.Themes.Simple/Controls/TreeViewItem.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/TreeViewItem.xaml
@@ -43,7 +43,7 @@
                   Focusable="True"
                   TemplatedControl.IsTemplateFocusTarget="True">
             <Grid Name="PART_Header"
-                  ColumnDefinitions="16, *">
+                  ColumnDefinitions="16, Auto">
               <Grid.Margin>
                 <MultiBinding Converter="{x:Static converters:TreeViewItemIndentConverter.Instance}">
                   <Binding Path="Level" RelativeSource="{RelativeSource TemplatedParent}" />