diff --git a/src/Views/BranchTree.axaml b/src/Views/BranchTree.axaml
index 72dd5751..9525631c 100644
--- a/src/Views/BranchTree.axaml
+++ b/src/Views/BranchTree.axaml
@@ -56,11 +56,11 @@
           <TextBlock Grid.Column="1"
                       Text="{Binding Name}"
                       Classes="primary"
-                      FontWeight="{Binding NameFontWeight}"/>
+                      FontWeight="{Binding NameFontWeight}"
+                      TextTrimming="CharacterEllipsis"/>
 
           <!-- Tracking status -->
           <v:BranchTreeNodeTrackStatusPresenter Grid.Column="2"
-                                                Margin="8,0"
                                                 VerticalAlignment="Center"
                                                 FontFamily="{DynamicResource Fonts.Monospace}"
                                                 FontSize="10"
diff --git a/src/Views/BranchTree.axaml.cs b/src/Views/BranchTree.axaml.cs
index b0790f4a..bba91274 100644
--- a/src/Views/BranchTree.axaml.cs
+++ b/src/Views/BranchTree.axaml.cs
@@ -161,8 +161,8 @@ namespace SourceGit.Views
 
             if (_label != null)
             {
-                context.DrawRectangle(Background, null, new RoundedRect(new Rect(0, 0, _label.Width + 18, 18), new CornerRadius(9)));
-                context.DrawText(_label, new Point(9, 9 - _label.Height * 0.5));
+                context.DrawRectangle(Background, null, new RoundedRect(new Rect(8, 0, _label.Width + 18, 18), new CornerRadius(9)));
+                context.DrawText(_label, new Point(17, 9 - _label.Height * 0.5));
             }
         }
 
@@ -192,7 +192,7 @@ namespace SourceGit.Views
                 }
             }
 
-            return _label != null ? new Size(_label.Width + 18, 18) : new Size(0, 0);
+            return _label != null ? new Size(_label.Width + 18 /* Padding */ + 16 /* Margin */, 18) : new Size(0, 0);
         }
 
         private FormattedText _label = null;