diff --git a/src/Views/BranchTree.axaml b/src/Views/BranchTree.axaml
index a90b327e..dad4f820 100644
--- a/src/Views/BranchTree.axaml
+++ b/src/Views/BranchTree.axaml
@@ -55,9 +55,7 @@
                   DoubleTapped="OnDoubleTappedBranchNode">
 
               <!-- Icon -->
-              <v:BranchTreeNodeIcon Grid.Column="0"
-                                    Node="{Binding}"
-                                    IsExpanded="{Binding IsExpanded}"/>
+              <v:BranchTreeNodeIcon Grid.Column="0" IsExpanded="{Binding IsExpanded}"/>
 
               <!-- Name -->
               <TextBlock Grid.Column="1"
diff --git a/src/Views/BranchTree.axaml.cs b/src/Views/BranchTree.axaml.cs
index 8542157d..d8fe7903 100644
--- a/src/Views/BranchTree.axaml.cs
+++ b/src/Views/BranchTree.axaml.cs
@@ -17,15 +17,6 @@ namespace SourceGit.Views
 {
     public class BranchTreeNodeIcon : UserControl
     {
-        public static readonly StyledProperty<ViewModels.BranchTreeNode> NodeProperty =
-            AvaloniaProperty.Register<BranchTreeNodeIcon, ViewModels.BranchTreeNode>(nameof(Node));
-
-        public ViewModels.BranchTreeNode Node
-        {
-            get => GetValue(NodeProperty);
-            set => SetValue(NodeProperty, value);
-        }
-
         public static readonly StyledProperty<bool> IsExpandedProperty =
             AvaloniaProperty.Register<BranchTreeNodeIcon, bool>(nameof(IsExpanded));
 
@@ -35,16 +26,23 @@ namespace SourceGit.Views
             set => SetValue(IsExpandedProperty, value);
         }
 
-        static BranchTreeNodeIcon()
+        protected override void OnDataContextChanged(EventArgs e)
         {
-            NodeProperty.Changed.AddClassHandler<BranchTreeNodeIcon>((icon, _) => icon.UpdateContent());
-            IsExpandedProperty.Changed.AddClassHandler<BranchTreeNodeIcon>((icon, _) => icon.UpdateContent());
+            base.OnDataContextChanged(e);
+            UpdateContent();
+        }
+
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+        {
+            base.OnPropertyChanged(change);
+
+            if (change.Property == IsExpandedProperty)
+                UpdateContent();
         }
 
         private void UpdateContent()
         {
-            var node = Node;
-            if (node == null)
+            if (DataContext is not ViewModels.BranchTreeNode node)
             {
                 Content = null;
                 return;