diff --git a/src/Views/ExecuteCustomAction.axaml b/src/Views/ExecuteCustomAction.axaml
index fd2a9c65..497f17cd 100644
--- a/src/Views/ExecuteCustomAction.axaml
+++ b/src/Views/ExecuteCustomAction.axaml
@@ -56,12 +56,6 @@
 
     <ItemsControl IsVisible="{Binding ControlParameters, Converter={x:Static c:ListConverters.IsNotNullOrEmpty}}"
                   ItemsSource="{Binding ControlParameters, Mode=OneWay}">
-      <ItemsControl.Styles>
-        <Style Selector="ContentPresenter">
-          <Setter Property="Margin" Value="0,1,0,1"/>
-        </Style>
-      </ItemsControl.Styles>
-
       <ItemsControl.ItemsPanel>
         <ItemsPanelTemplate>
           <StackPanel Orientation="Vertical"/>
@@ -70,7 +64,7 @@
 
       <ItemsControl.DataTemplates>
         <DataTemplate DataType="vm:CustomActionControlTextBox">
-          <Grid ColumnDefinitions="150,*">
+          <Grid Height="32" ColumnDefinitions="150,*">
             <TextBlock Grid.Column="0"
                        Text="{Binding Label}"
                        HorizontalAlignment="Right" VerticalAlignment="Center"
@@ -85,7 +79,7 @@
         </DataTemplate>
 
         <DataTemplate DataType="vm:CustomActionControlCheckBox">
-          <Grid ColumnDefinitions="150,*">
+          <Grid Height="32" ColumnDefinitions="150,*">
             <CheckBox Grid.Column="1"
                       Content="{Binding Label}"
                       ToolTip.Tip="{Binding ToolTip, Mode=OneWay}"
@@ -94,7 +88,7 @@
         </DataTemplate>
 
         <DataTemplate DataType="vm:CustomActionControlPathSelector">
-          <Grid ColumnDefinitions="150,*">
+          <Grid Height="32" ColumnDefinitions="150,*">
             <TextBlock Grid.Column="0"
                        Text="{Binding Label}"
                        HorizontalAlignment="Right" VerticalAlignment="Center"
diff --git a/src/Views/ExecuteCustomAction.axaml.cs b/src/Views/ExecuteCustomAction.axaml.cs
index 1a077469..e454d4a1 100644
--- a/src/Views/ExecuteCustomAction.axaml.cs
+++ b/src/Views/ExecuteCustomAction.axaml.cs
@@ -1,5 +1,5 @@
 using System;
-using System.Linq;
+
 using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Interactivity;
@@ -17,11 +17,15 @@ namespace SourceGit.Views
 
         private void OnLoaded(object sender, RoutedEventArgs e)
         {
-            var firstFocusable = this
-                .GetVisualDescendants()
-                .OfType<InputElement>()
-                .FirstOrDefault(x => x.Focusable && x.IsTabStop);
-            firstFocusable?.Focus();
+            var inputs = this.GetVisualDescendants();
+            foreach (var input in inputs)
+            {
+                if (input is InputElement { Focusable: true, IsTabStop: true } focusable)
+                {
+                    focusable.Focus();
+                    return;
+                }
+            }
         }
 
         private async void SelectPath(object sender, RoutedEventArgs e)