diff --git a/src/Converters/BranchTreeNodeConverters.cs b/src/Converters/BranchTreeNodeConverters.cs
deleted file mode 100644
index 14f73fd7..00000000
--- a/src/Converters/BranchTreeNodeConverters.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-using System.Collections.Generic;
-
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Data.Converters;
-
-namespace SourceGit.Converters
-{
-    public static class BranchTreeNodeConverters
-    {
-        public static readonly CornerRadius DEFAULT = new CornerRadius(4);
-        
-        public static readonly FuncMultiValueConverter<object, CornerRadius> ToCornerRadius =
-            new FuncMultiValueConverter<object, CornerRadius>(v =>
-            {
-                if (v == null)
-                    return DEFAULT;
-
-                var array = new List<object>();
-                array.AddRange(v);
-                if (array.Count != 2)
-                    return DEFAULT;
-
-                var item = array[1] as TreeViewItem;
-                if (item == null || !item.IsSelected)
-                    return DEFAULT;
-
-                var prev = GetPrevTreeViewItem(item);
-                var next = GetNextTreeViewItem(item, true);
-
-                double top = 4, bottom = 4;
-                if (prev != null && prev.IsSelected)
-                    top = 0;
-                if (next != null && next.IsSelected)
-                    bottom = 0;
-
-                return new CornerRadius(top, bottom);
-            });
-
-        private static TreeViewItem GetPrevTreeViewItem(TreeViewItem item)
-        {
-            if (item.Parent is TreeView tree)
-            {
-                var idx = tree.IndexFromContainer(item);
-                if (idx == 0)
-                    return null;
-
-                var prev = tree.ContainerFromIndex(idx - 1) as TreeViewItem;
-                if (prev != null && prev.IsExpanded && prev.ItemCount > 0)
-                    return prev.ContainerFromIndex(prev.ItemCount - 1) as TreeViewItem;
-
-                return prev;
-            }
-            else if (item.Parent is TreeViewItem parentItem)
-            {
-                var idx = parentItem.IndexFromContainer(item);
-                if (idx == 0)
-                    return parentItem;
-
-                var prev = parentItem.ContainerFromIndex(idx - 1) as TreeViewItem;
-                if (prev != null && prev.IsExpanded && prev.ItemCount > 0)
-                    return prev.ContainerFromIndex(prev.ItemCount - 1) as TreeViewItem;
-
-                return prev;
-            }
-            else
-            {
-                return null;
-            }
-        }
-
-        private static TreeViewItem GetNextTreeViewItem(TreeViewItem item, bool intoSelf = false)
-        {
-            if (intoSelf && item.IsExpanded && item.ItemCount > 0)
-                return item.ContainerFromIndex(0) as TreeViewItem;
-            
-            if (item.Parent is TreeView tree)
-            {
-                var idx = tree.IndexFromContainer(item);
-                if (idx == tree.ItemCount - 1)
-                    return null;
-
-                return tree.ContainerFromIndex(idx + 1) as TreeViewItem;
-            }
-            else if (item.Parent is TreeViewItem parentItem)
-            {
-                var idx = parentItem.IndexFromContainer(item);
-                if (idx == parentItem.ItemCount - 1)
-                    return GetNextTreeViewItem(parentItem);
-                
-                return parentItem.ContainerFromIndex(idx + 1) as TreeViewItem;
-            }
-            else
-            {
-                return null;
-            }
-        }
-    }
-}
diff --git a/src/ViewModels/BranchTreeNode.cs b/src/ViewModels/BranchTreeNode.cs
index b6b88b5d..194b1a26 100644
--- a/src/ViewModels/BranchTreeNode.cs
+++ b/src/ViewModels/BranchTreeNode.cs
@@ -1,8 +1,12 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+
+using Avalonia;
 using Avalonia.Collections;
 
+using CommunityToolkit.Mvvm.ComponentModel;
+
 namespace SourceGit.ViewModels
 {
     public enum BranchTreeNodeType
@@ -12,8 +16,10 @@ namespace SourceGit.ViewModels
         Branch,
     }
 
-    public class BranchTreeNode
+    public class BranchTreeNode : ObservableObject
     {
+        public const double DEFAULT_CORNER = 4.0;
+
         public string Name { get; set; }
         public BranchTreeNodeType Type { get; set; }
         public object Backend { get; set; }
@@ -51,6 +57,43 @@ namespace SourceGit.ViewModels
             get => IsBranch && (Backend as Models.Branch).IsCurrent;
         }
 
+        public bool IsSelected
+        {
+            get => _isSelected;
+            set => SetProperty(ref _isSelected, value);
+        }
+
+        public CornerRadius CornerRadius
+        {
+            get => _cornerRadius;
+            set => SetProperty(ref _cornerRadius, value);
+        }
+
+        public void UpdateCornerRadius(ref BranchTreeNode prev)
+        {
+            if (_isSelected && prev != null && prev.IsSelected)
+            {
+                var prevTop = prev.CornerRadius.TopLeft;
+                prev.CornerRadius = new CornerRadius(prevTop, 0);
+                CornerRadius = new CornerRadius(0, DEFAULT_CORNER);
+            }
+            else if (CornerRadius.TopLeft != DEFAULT_CORNER ||
+                CornerRadius.BottomLeft != DEFAULT_CORNER)
+            {
+                CornerRadius = new CornerRadius(DEFAULT_CORNER);
+            }
+
+            prev = this;
+
+            if (!IsBranch && IsExpanded)
+            {
+                foreach (var child in Children)
+                    child.UpdateCornerRadius(ref prev);
+            }
+        }
+        private bool _isSelected = false;
+        private CornerRadius _cornerRadius = new CornerRadius(DEFAULT_CORNER);
+
         public class Builder
         {
             public List<BranchTreeNode> Locals => _locals;
diff --git a/src/Views/DeleteMultipleBranches.axaml b/src/Views/DeleteMultipleBranches.axaml
index ca0282ef..75f28674 100644
--- a/src/Views/DeleteMultipleBranches.axaml
+++ b/src/Views/DeleteMultipleBranches.axaml
@@ -14,75 +14,69 @@
                Classes="bold"
                Text="{DynamicResource Text.DeleteMultiBranch}" />
 
-    <Grid Margin="0,16,8,0" RowDefinitions="Auto,Auto" ColumnDefinitions="120,*">
-      <TextBlock Grid.Row="0" Grid.Column="0"
-                 HorizontalAlignment="Right" VerticalAlignment="Top"
-                 Text="{DynamicResource Text.DeleteMultiBranch.Targets}" />
-      <Border Grid.Row="0" Grid.Column="1"
-              Background="{DynamicResource Brush.Contents}"
-              BorderThickness="1"
-              BorderBrush="{DynamicResource Brush.Border1}"
-              CornerRadius="4"
-              Padding="4">
-        <DataGrid MaxHeight="200"
-                  Background="Transparent"
-                  BorderThickness="0"
-                  ItemsSource="{Binding Targets}"
-                  SelectionMode="Single"
-                  CanUserReorderColumns="False"
-                  CanUserResizeColumns="False"
-                  CanUserSortColumns="False"
-                  IsReadOnly="True"
-                  HeadersVisibility="None"
-                  Focusable="False"
-                  RowHeight="26"
-                  HorizontalScrollBarVisibility="Auto"
-                  VerticalScrollBarVisibility="Auto">
-          <DataGrid.Styles>
-            <Style Selector="DataGridRow">
-              <Setter Property="CornerRadius" Value="4" />
-            </Style>
+    <Border Margin="4,16,0,0"
+            Background="{DynamicResource Brush.Contents}"
+            BorderThickness="1"
+            BorderBrush="{DynamicResource Brush.Border1}"
+            CornerRadius="4"
+            Padding="4">
+      <DataGrid MaxHeight="200"
+                Background="Transparent"
+                BorderThickness="0"
+                ItemsSource="{Binding Targets}"
+                SelectionMode="Single"
+                CanUserReorderColumns="False"
+                CanUserResizeColumns="False"
+                CanUserSortColumns="False"
+                IsReadOnly="True"
+                HeadersVisibility="None"
+                Focusable="False"
+                RowHeight="26"
+                HorizontalScrollBarVisibility="Auto"
+                VerticalScrollBarVisibility="Auto">
+        <DataGrid.Styles>
+          <Style Selector="DataGridRow">
+            <Setter Property="CornerRadius" Value="4" />
+          </Style>
 
-            <Style Selector="DataGridRow /template/ Border#RowBorder">
-              <Setter Property="ClipToBounds" Value="True" />
-            </Style>
+          <Style Selector="DataGridRow /template/ Border#RowBorder">
+            <Setter Property="ClipToBounds" Value="True" />
+          </Style>
 
-            <Style Selector="DataGridRow:pointerover /template/ Rectangle#BackgroundRectangle">
-              <Setter Property="Fill" Value="{DynamicResource Brush.AccentHovered}" />
-            </Style>
+          <Style Selector="DataGridRow:pointerover /template/ Rectangle#BackgroundRectangle">
+            <Setter Property="Fill" Value="{DynamicResource Brush.AccentHovered}" />
+          </Style>
 
-            <Style Selector="DataGridRow:selected /template/ Rectangle#BackgroundRectangle">
-              <Setter Property="Fill" Value="{DynamicResource Brush.Accent}" />
-            </Style>
-          </DataGrid.Styles>
+          <Style Selector="DataGridRow:selected /template/ Rectangle#BackgroundRectangle">
+            <Setter Property="Fill" Value="{DynamicResource Brush.Accent}" />
+          </Style>
+        </DataGrid.Styles>
 
-          <DataGrid.Columns>
-            <DataGridTemplateColumn Header="ICON">
-              <DataGridTemplateColumn.CellTemplate>
-                <DataTemplate>
-                  <Path Width="10" Height="10" Margin="4,0,8,0" Data="{StaticResource Icons.Branch}" />
-                </DataTemplate>
-              </DataGridTemplateColumn.CellTemplate>
-            </DataGridTemplateColumn>
+        <DataGrid.Columns>
+          <DataGridTemplateColumn Header="ICON">
+            <DataGridTemplateColumn.CellTemplate>
+              <DataTemplate>
+                <Path Width="10" Height="10" Margin="4,0,8,0" Data="{StaticResource Icons.Branch}" />
+              </DataTemplate>
+            </DataGridTemplateColumn.CellTemplate>
+          </DataGridTemplateColumn>
 
-            <DataGridTemplateColumn Width="*" Header="NAME">
-              <DataGridTemplateColumn.CellTemplate>
-                <DataTemplate>
-                  <TextBlock Text="{Binding Converter={x:Static c:BranchConverters.ToName}}" ClipToBounds="True"
-                             Classes="monospace" />
-                </DataTemplate>
-              </DataGridTemplateColumn.CellTemplate>
-            </DataGridTemplateColumn>
-          </DataGrid.Columns>
-        </DataGrid>
-      </Border>
-      
-      <TextBlock Grid.Row="1" Grid.Column="1"
-                 Margin="0,8,0,0"
-                 Text="{DynamicResource Text.DeleteMultiBranch.Tip}"
-                 TextWrapping="Wrap"
-                 Foreground="{DynamicResource Brush.FG2}"
-                 FontStyle="Italic" />
-    </Grid>
+          <DataGridTemplateColumn Width="*" Header="NAME">
+            <DataGridTemplateColumn.CellTemplate>
+              <DataTemplate>
+                <TextBlock Text="{Binding Converter={x:Static c:BranchConverters.ToName}}" ClipToBounds="True"
+                           Classes="monospace" />
+              </DataTemplate>
+            </DataGridTemplateColumn.CellTemplate>
+          </DataGridTemplateColumn>
+        </DataGrid.Columns>
+      </DataGrid>
+    </Border>
+
+    <TextBlock Margin="4,8,0,0"
+               Text="{DynamicResource Text.DeleteMultiBranch.Tip}"
+               TextWrapping="Wrap"
+               Foreground="{DynamicResource Brush.FG2}"
+               FontStyle="Italic" />
   </StackPanel>
 </UserControl>
diff --git a/src/Views/Repository.axaml b/src/Views/Repository.axaml
index 765210ae..9df2b540 100644
--- a/src/Views/Repository.axaml
+++ b/src/Views/Repository.axaml
@@ -208,14 +208,8 @@
           <TreeView.Styles>
             <Style Selector="TreeViewItem" x:DataType="vm:BranchTreeNode">
               <Setter Property="IsExpanded" Value="{Binding IsExpanded, Mode=TwoWay}"/>
-              <Setter Property="CornerRadius">
-                <Setter.Value>
-                  <MultiBinding Converter="{x:Static c:BranchTreeNodeConverters.ToCornerRadius}">
-                    <Binding Path="$parent[v:Repository].RefereshLocalBranchSelectionToken"/>
-                    <Binding Path="$self"/>
-                  </MultiBinding>
-                </Setter.Value>
-              </Setter>
+              <Setter Property="IsSelected" Value="{Binding IsSelected, Mode=TwoWay}"/>
+              <Setter Property="CornerRadius" Value="{Binding CornerRadius}"/>
             </Style>
 
             <Style Selector="Grid.repository_leftpanel TreeViewItem:selected /template/ Border#PART_LayoutRoot">
@@ -278,14 +272,8 @@
           <TreeView.Styles>
             <Style Selector="TreeViewItem" x:DataType="vm:BranchTreeNode">
               <Setter Property="IsExpanded" Value="{Binding IsExpanded, Mode=TwoWay}"/>
-              <Setter Property="CornerRadius">
-                <Setter.Value>
-                  <MultiBinding Converter="{x:Static c:BranchTreeNodeConverters.ToCornerRadius}">
-                    <Binding Path="$parent[v:Repository].RefereshRemoteBranchSelectionToken"/>
-                    <Binding Path="$self"/>
-                  </MultiBinding>
-                </Setter.Value>
-              </Setter>
+              <Setter Property="IsSelected" Value="{Binding IsSelected, Mode=TwoWay}"/>
+              <Setter Property="CornerRadius" Value="{Binding CornerRadius}"/>
             </Style>
 
             <Style Selector="Grid.repository_leftpanel TreeViewItem:selected /template/ Border#PART_LayoutRoot">
diff --git a/src/Views/Repository.axaml.cs b/src/Views/Repository.axaml.cs
index bd5a69d7..ed26905a 100644
--- a/src/Views/Repository.axaml.cs
+++ b/src/Views/Repository.axaml.cs
@@ -58,24 +58,6 @@ namespace SourceGit.Views
 
     public partial class Repository : UserControl
     {
-        public static readonly StyledProperty<ulong> RefereshLocalBranchSelectionTokenProperty =
-            AvaloniaProperty.Register<Repository, ulong>(nameof(RefereshLocalBranchSelectionToken), 0);
-
-        public ulong RefereshLocalBranchSelectionToken
-        {
-            get => GetValue(RefereshLocalBranchSelectionTokenProperty);
-            set => SetValue(RefereshLocalBranchSelectionTokenProperty, value);
-        }
-
-        public static readonly StyledProperty<ulong> RefereshRemoteBranchSelectionTokenProperty =
-            AvaloniaProperty.Register<Repository, ulong>(nameof(RefereshRemoteBranchSelectionToken), 0);
-
-        public ulong RefereshRemoteBranchSelectionToken
-        {
-            get => GetValue(RefereshRemoteBranchSelectionTokenProperty);
-            set => SetValue(RefereshRemoteBranchSelectionTokenProperty, value);
-        }
-
         public Repository()
         {
             InitializeComponent();
@@ -93,18 +75,19 @@ namespace SourceGit.Views
 
         private void OnLocalBranchTreeSelectionChanged(object sender, SelectionChangedEventArgs e)
         {
-            if (sender is TreeView tree && tree.SelectedItem != null)
+            if (sender is TreeView tree && tree.SelectedItem != null && DataContext is ViewModels.Repository repo)
             {
                 remoteBranchTree.UnselectAll();
                 tagsList.SelectedItem = null;
 
-                var next = RefereshLocalBranchSelectionToken + 1;
-                SetCurrentValue(RefereshLocalBranchSelectionTokenProperty, next);
-
+                ViewModels.BranchTreeNode prev = null;
+                foreach (var node in repo.LocalBranchTrees)
+                    node.UpdateCornerRadius(ref prev);
+                
                 if (tree.SelectedItems.Count == 1)
                 {
                     var node = tree.SelectedItem as ViewModels.BranchTreeNode;
-                    if (node.IsBranch && DataContext is ViewModels.Repository repo)
+                    if (node.IsBranch)
                         repo.NavigateToCommit((node.Backend as Models.Branch).Head);
                 }
             }
@@ -112,18 +95,19 @@ namespace SourceGit.Views
 
         private void OnRemoteBranchTreeSelectionChanged(object sender, SelectionChangedEventArgs e)
         {
-            if (sender is TreeView tree && tree.SelectedItem != null)
+            if (sender is TreeView tree && tree.SelectedItem != null && DataContext is ViewModels.Repository repo)
             {
                 localBranchTree.UnselectAll();
                 tagsList.SelectedItem = null;
 
-                var next = RefereshRemoteBranchSelectionToken + 1;
-                SetCurrentValue(RefereshRemoteBranchSelectionTokenProperty, next);
+                ViewModels.BranchTreeNode prev = null;
+                foreach (var node in repo.RemoteBranchTrees)
+                    node.UpdateCornerRadius(ref prev);
 
                 if (tree.SelectedItems.Count == 1)
                 {
                     var node = tree.SelectedItem as ViewModels.BranchTreeNode;
-                    if (node.IsBranch && DataContext is ViewModels.Repository repo)
+                    if (node.IsBranch)
                         repo.NavigateToCommit((node.Backend as Models.Branch).Head);
                 }
             }
@@ -204,6 +188,11 @@ namespace SourceGit.Views
 
             var repo = DataContext as ViewModels.Repository;
             var tree = sender as TreeView;
+            if (tree.SelectedItems.Count == 0)
+            {
+                e.Handled = true;
+                return;
+            }
             
             var branches = new List<Models.Branch>();
             foreach (var item in tree.SelectedItems)
@@ -243,6 +232,11 @@ namespace SourceGit.Views
             
             var repo = DataContext as ViewModels.Repository;
             var tree = sender as TreeView;
+            if (tree.SelectedItems.Count == 0)
+            {
+                e.Handled = true;
+                return;
+            }
 
             if (tree.SelectedItems.Count == 1)
             {