diff --git a/src/Views/Welcome.axaml b/src/Views/Welcome.axaml
index 89e7f286..fbf2b6b1 100644
--- a/src/Views/Welcome.axaml
+++ b/src/Views/Welcome.axaml
@@ -89,6 +89,7 @@
           <ListBox.ItemTemplate>
             <DataTemplate DataType="vm:RepositoryNode">
               <Grid Background="Transparent"
+                    VerticalAlignment="Center"
                     ColumnDefinitions="16,18,Auto,*"
                     Margin="{Binding Depth, Converter={x:Static c:IntConverters.ToTreeMargin}}"
                     Loaded="SetupTreeNodeDragAndDrop"
diff --git a/src/Views/Welcome.axaml.cs b/src/Views/Welcome.axaml.cs
index 1e50406b..4d34eec1 100644
--- a/src/Views/Welcome.axaml.cs
+++ b/src/Views/Welcome.axaml.cs
@@ -95,9 +95,9 @@ namespace SourceGit.Views
 
         private void OnTreeNodeContextRequested(object sender, ContextRequestedEventArgs e)
         {
-            if (sender is Grid grid)
+            if (sender is Grid { DataContext: ViewModels.RepositoryNode node } grid)
             {
-                var menu = ViewModels.Welcome.Instance.CreateContextMenu(grid.DataContext as ViewModels.RepositoryNode);
+                var menu = ViewModels.Welcome.Instance.CreateContextMenu(node);
                 grid.OpenContextMenu(menu);
                 e.Handled = true;
             }