diff --git a/src/SourceGit/ViewModels/Repository.cs b/src/SourceGit/ViewModels/Repository.cs
index bdc2291f..9a3626a4 100644
--- a/src/SourceGit/ViewModels/Repository.cs
+++ b/src/SourceGit/ViewModels/Repository.cs
@@ -568,6 +568,9 @@ namespace SourceGit.ViewModels
         public void RefreshWorkingCopyChanges()
         {
             var changes = new Commands.QueryLocalChanges(FullPath, _includeUntracked).Result();
+            if (_workingCopy == null)
+                return;
+
             var hasUnsolvedConflict = _workingCopy.SetData(changes);
             var inProgress = null as InProgressContext;
 
diff --git a/src/SourceGit/Views/AddRemote.axaml b/src/SourceGit/Views/AddRemote.axaml
index aeef9fa0..4123d501 100644
--- a/src/SourceGit/Views/AddRemote.axaml
+++ b/src/SourceGit/Views/AddRemote.axaml
@@ -4,31 +4,33 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:m="using:SourceGit.Models"
              xmlns:vm="using:SourceGit.ViewModels"
+             xmlns:v="using:SourceGit.Views"
              xmlns:c="using:SourceGit.Converters"
              mc:Ignorable="d" d:DesignWidth="500" d:DesignHeight="450"
              x:Class="SourceGit.Views.AddRemote"
              x:DataType="vm:AddRemote">
   <StackPanel Orientation="Vertical" Margin="8,0">
     <TextBlock FontSize="18"
-				       Classes="bold"
-				       Text="{DynamicResource Text.Remote.AddTitle}"/>
+               Classes="bold"
+               Text="{DynamicResource Text.Remote.AddTitle}"/>
 
     <Grid Margin="0,16,0,0" RowDefinitions="32,32,Auto" ColumnDefinitions="150,*">
       <TextBlock Grid.Row="0" Grid.Column="0"
-					       HorizontalAlignment="Right" VerticalAlignment="Center"
-					       Margin="0,0,8,0"
-					       Text="{DynamicResource Text.Remote.Name}"/>
+                 HorizontalAlignment="Right" VerticalAlignment="Center"
+                 Margin="0,0,8,0"
+                 Text="{DynamicResource Text.Remote.Name}"/>
       <TextBox Grid.Row="0" Grid.Column="1"
                Height="26"
                VerticalAlignment="Center"
                CornerRadius="2"
                Watermark="{DynamicResource Text.Remote.Name.Placeholder}"
-               Text="{Binding Name, Mode=TwoWay}"/>
+               Text="{Binding Name, Mode=TwoWay}"
+               v:AutoFocusBehaviour.IsEnabled="True"/>
 
       <TextBlock Grid.Row="1" Grid.Column="0"
-					       HorizontalAlignment="Right" VerticalAlignment="Center"
-					       Margin="0,0,8,0"
-					       Text="{DynamicResource Text.Remote.URL}"/>
+                 HorizontalAlignment="Right" VerticalAlignment="Center"
+                 Margin="0,0,8,0"
+                 Text="{DynamicResource Text.Remote.URL}"/>
       <TextBox Grid.Row="1" Grid.Column="1"
                Height="26"
                VerticalAlignment="Center"
@@ -37,9 +39,9 @@
                Text="{Binding Url, Mode=TwoWay}"/>
 
       <TextBlock Grid.Row="2" Grid.Column="0"
-					       HorizontalAlignment="Right" VerticalAlignment="Center"
-					       Margin="0,0,8,0"
-					       Text="{DynamicResource Text.SSHKey}"
+                 HorizontalAlignment="Right" VerticalAlignment="Center"
+                 Margin="0,0,8,0"
+                 Text="{DynamicResource Text.SSHKey}"
                  IsVisible="{Binding UseSSH}"/>
       <TextBox Grid.Row="2" Grid.Column="1"
                x:Name="txtSSHKey"
diff --git a/src/SourceGit/Views/AddSubmodule.axaml b/src/SourceGit/Views/AddSubmodule.axaml
index f7c70bfd..32ad9dc2 100644
--- a/src/SourceGit/Views/AddSubmodule.axaml
+++ b/src/SourceGit/Views/AddSubmodule.axaml
@@ -4,30 +4,32 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:m="using:SourceGit.Models"
              xmlns:vm="using:SourceGit.ViewModels"
+             xmlns:v="using:SourceGit.Views"
              xmlns:c="using:SourceGit.Converters"
              mc:Ignorable="d" d:DesignWidth="500" d:DesignHeight="450"
              x:Class="SourceGit.Views.AddSubmodule"
              x:DataType="vm:AddSubmodule">
   <StackPanel Orientation="Vertical" Margin="8,0">
     <TextBlock FontSize="18"
-				       Classes="bold"
-				       Text="{DynamicResource Text.Submodule.Add}"/>
+               Classes="bold"
+               Text="{DynamicResource Text.Submodule.Add}"/>
     <Grid Margin="0,16,0,0" RowDefinitions="32,32,32" ColumnDefinitions="150,*">
       <TextBlock Grid.Row="0" Grid.Column="0"
-					       HorizontalAlignment="Right" VerticalAlignment="Center"
-					       Margin="0,0,8,0"
-					       Text="{DynamicResource Text.URL}"/>
+                 HorizontalAlignment="Right" VerticalAlignment="Center"
+                 Margin="0,0,8,0"
+                 Text="{DynamicResource Text.URL}"/>
       <TextBox Grid.Row="0" Grid.Column="1"
                Height="26"
                VerticalAlignment="Center"
                CornerRadius="2"
                Watermark="{DynamicResource Text.RepositoryURL}"
-               Text="{Binding Url, Mode=TwoWay}"/>
+               Text="{Binding Url, Mode=TwoWay}"
+               v:AutoFocusBehaviour.IsEnabled="True"/>
 
       <TextBlock Grid.Row="1" Grid.Column="0"
-					       HorizontalAlignment="Right" VerticalAlignment="Center"
-					       Margin="0,0,8,0"
-					       Text="{DynamicResource Text.Submodule.RelativePath}"/>
+                 HorizontalAlignment="Right" VerticalAlignment="Center"
+                 Margin="0,0,8,0"
+                 Text="{DynamicResource Text.Submodule.RelativePath}"/>
       <TextBox Grid.Row="1" Grid.Column="1"
                Height="26"
                VerticalAlignment="Center"
diff --git a/src/SourceGit/Views/Apply.axaml b/src/SourceGit/Views/Apply.axaml
index 2f9b4ae8..cb4fc6f1 100644
--- a/src/SourceGit/Views/Apply.axaml
+++ b/src/SourceGit/Views/Apply.axaml
@@ -4,26 +4,28 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:m="using:SourceGit.Models"
              xmlns:vm="using:SourceGit.ViewModels"
+             xmlns:v="using:SourceGit.Views"
              xmlns:c="using:SourceGit.Converters"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="SourceGit.Views.Apply"
              x:DataType="vm:Apply">
   <StackPanel Orientation="Vertical" Margin="8,0">
     <TextBlock FontSize="18"
-				       Classes="bold"
-				       Text="{DynamicResource Text.Apply.Title}"/>
+               Classes="bold"
+               Text="{DynamicResource Text.Apply.Title}"/>
 
     <Grid Margin="0,16,0,0" RowDefinitions="32,32,32" ColumnDefinitions="150,*">
       <TextBlock Grid.Column="0"
-					       HorizontalAlignment="Right" VerticalAlignment="Center"
-					       Margin="0,0,8,0"
-					       Text="{DynamicResource Text.Apply.File}"/>
+                 HorizontalAlignment="Right" VerticalAlignment="Center"
+                 Margin="0,0,8,0"
+                 Text="{DynamicResource Text.Apply.File}"/>
       <TextBox Grid.Row="0" Grid.Column="1"
                x:Name="txtPatchFile"
                Height="28"
                CornerRadius="3"
                Watermark="{DynamicResource Text.Apply.File.Placeholder}"
-               Text="{Binding PatchFile, Mode=TwoWay}">
+               Text="{Binding PatchFile, Mode=TwoWay}"
+               v:AutoFocusBehaviour.IsEnabled="True">
         <TextBox.InnerRightContent>
           <Button Classes="icon_button" Width="30" Height="30" Click="SelectPatchFile">
             <Path Data="{StaticResource Icons.Folder.Open}" Fill="{DynamicResource Brush.FG1}"/>
@@ -32,9 +34,9 @@
       </TextBox>
 
       <TextBlock Grid.Row="1" Grid.Column="0"
-					       HorizontalAlignment="Right" VerticalAlignment="Center"
-					       Margin="0,0,8,0"
-					       Text="{DynamicResource Text.Apply.WS}"/>
+                 HorizontalAlignment="Right" VerticalAlignment="Center"
+                 Margin="0,0,8,0"
+                 Text="{DynamicResource Text.Apply.WS}"/>
       <ComboBox Grid.Row="1" Grid.Column="1"
                 Height="28" Padding="8,0"
                 VerticalAlignment="Center" HorizontalAlignment="Stretch"
diff --git a/src/SourceGit/Views/Archive.axaml b/src/SourceGit/Views/Archive.axaml
index 46ebe9a3..8cb89d49 100644
--- a/src/SourceGit/Views/Archive.axaml
+++ b/src/SourceGit/Views/Archive.axaml
@@ -4,19 +4,20 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:m="using:SourceGit.Models"
              xmlns:vm="using:SourceGit.ViewModels"
+             xmlns:v="using:SourceGit.Views"
              xmlns:c="using:SourceGit.Converters"
              mc:Ignorable="d" d:DesignWidth="500" d:DesignHeight="450"
              x:Class="SourceGit.Views.Archive"
              x:DataType="vm:Archive">
   <StackPanel Orientation="Vertical" Margin="8,0">
     <TextBlock FontSize="18"
-				       Classes="bold"
-				       Text="{DynamicResource Text.Archive.Title}"/>
+               Classes="bold"
+               Text="{DynamicResource Text.Archive.Title}"/>
     <Grid Margin="0,16,0,0" RowDefinitions="32,32" ColumnDefinitions="150,*">
       <TextBlock Grid.Column="0"
-					       HorizontalAlignment="Right" VerticalAlignment="Center"
-					       Margin="0,0,8,0"
-					       Text="{DynamicResource Text.Archive.Revision}"/>
+                 HorizontalAlignment="Right" VerticalAlignment="Center"
+                 Margin="0,0,8,0"
+                 Text="{DynamicResource Text.Archive.Revision}"/>
       <ContentControl Grid.Column="1" Content="{Binding BasedOn}">
         <ContentControl.DataTemplates>
           <DataTemplate DataType="m:Branch">
@@ -44,15 +45,16 @@
       </ContentControl>
 
       <TextBlock Grid.Row="1" Grid.Column="0"
-					       HorizontalAlignment="Right" VerticalAlignment="Center"
-					       Margin="0,0,8,0"
-					       Text="{DynamicResource Text.Archive.File}"/>
+                 HorizontalAlignment="Right" VerticalAlignment="Center"
+                 Margin="0,0,8,0"
+                 Text="{DynamicResource Text.Archive.File}"/>
       <TextBox Grid.Row="1" Grid.Column="1"
                x:Name="txtSaveFile"
                Height="28"
                CornerRadius="3"
                Watermark="{DynamicResource Text.Archive.File.Placeholder}"
-               Text="{Binding SaveFile, Mode=TwoWay}">
+               Text="{Binding SaveFile, Mode=TwoWay}"
+               v:AutoFocusBehaviour.IsEnabled="True">
         <TextBox.InnerRightContent>
           <Button Classes="icon_button" Width="30" Height="30" Click="SelectOutputFile">
             <Path Data="{StaticResource Icons.Folder.Open}" Fill="{DynamicResource Brush.FG1}"/>
diff --git a/src/SourceGit/Views/AutoFocusBehaviour.cs b/src/SourceGit/Views/AutoFocusBehaviour.cs
new file mode 100644
index 00000000..d7423a49
--- /dev/null
+++ b/src/SourceGit/Views/AutoFocusBehaviour.cs
@@ -0,0 +1,32 @@
+using Avalonia;
+using Avalonia.Input;
+
+namespace SourceGit.Views
+{
+    public class AutoFocusBehaviour : AvaloniaObject
+    {
+        public static readonly AttachedProperty<bool> IsEnabledProperty =
+            AvaloniaProperty.RegisterAttached<AutoFocusBehaviour, InputElement, bool>("IsEnabled", false, false);
+
+        static AutoFocusBehaviour()
+        {
+            IsEnabledProperty.Changed.AddClassHandler<InputElement>((input, e) =>
+            {
+                if (input.GetValue(IsEnabledProperty))
+                {
+                    input.AttachedToVisualTree += (o, _) => (o as InputElement).Focus(NavigationMethod.Directional);
+                }
+            });
+        }
+
+        public static bool GetIsEnabled(AvaloniaObject elem)
+        {
+            return elem.GetValue(IsEnabledProperty);
+        }
+
+        public static void SetIsEnabled(AvaloniaObject elem, bool value)
+        {
+            elem.SetValue(IsEnabledProperty, value);
+        }
+    }
+}
diff --git a/src/SourceGit/Views/Checkout.axaml b/src/SourceGit/Views/Checkout.axaml
index f921326b..083190f8 100644
--- a/src/SourceGit/Views/Checkout.axaml
+++ b/src/SourceGit/Views/Checkout.axaml
@@ -8,8 +8,8 @@
              x:DataType="vm:Checkout">
   <StackPanel Orientation="Vertical" Margin="8,0">
     <TextBlock FontSize="18"
-				       Classes="bold"
-				       Text="{DynamicResource Text.Checkout}"/>
+               Classes="bold"
+               Text="{DynamicResource Text.Checkout}"/>
     <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,16,0,0">
       <TextBlock Text="{DynamicResource Text.Checkout.Target}"/>
       <Path Width="14" Height="14" Margin="8,0" Data="{StaticResource Icons.Branch}"/>
diff --git a/src/SourceGit/Views/CherryPick.axaml b/src/SourceGit/Views/CherryPick.axaml
index 49c33298..7dbd6cdb 100644
--- a/src/SourceGit/Views/CherryPick.axaml
+++ b/src/SourceGit/Views/CherryPick.axaml
@@ -10,13 +10,13 @@
              x:DataType="vm:CherryPick">
   <StackPanel Orientation="Vertical" Margin="8,0">
     <TextBlock FontSize="18"
-				       Classes="bold"
-				       Text="{DynamicResource Text.CherryPick}"/>
+               Classes="bold"
+               Text="{DynamicResource Text.CherryPick}"/>
     <Grid Margin="0,16,0,0" RowDefinitions="32,32" ColumnDefinitions="150,*">
       <TextBlock Grid.Column="0"
-					       HorizontalAlignment="Right" VerticalAlignment="Center"
-					       Margin="0,0,8,0"
-					       Text="{DynamicResource Text.CherryPick.Commit}"/>
+                 HorizontalAlignment="Right" VerticalAlignment="Center"
+                 Margin="0,0,8,0"
+                 Text="{DynamicResource Text.CherryPick.Commit}"/>
 
       <StackPanel Grid.Column="1" Orientation="Horizontal">
         <Path Width="14" Height="14" Margin="0,8,0,0" Data="{StaticResource Icons.Commit}"/>
diff --git a/src/SourceGit/Views/Cleanup.axaml b/src/SourceGit/Views/Cleanup.axaml
index 7e5d8ff9..dc429420 100644
--- a/src/SourceGit/Views/Cleanup.axaml
+++ b/src/SourceGit/Views/Cleanup.axaml
@@ -10,8 +10,8 @@
              x:DataType="vm:Cleanup">
   <StackPanel Orientation="Vertical" Margin="8,0">
     <TextBlock FontSize="18"
-				       Classes="bold"
-				       Text="{DynamicResource Text.Repository.Clean}"/>
+               Classes="bold"
+               Text="{DynamicResource Text.Repository.Clean}"/>
     <TextBlock Text="{DynamicResource Text.Repository.CleanTips}"
                Margin="0,16,0,0"
                HorizontalAlignment="Center"/>
diff --git a/src/SourceGit/Views/ClearStashes.axaml b/src/SourceGit/Views/ClearStashes.axaml
index 666bf273..b986211b 100644
--- a/src/SourceGit/Views/ClearStashes.axaml
+++ b/src/SourceGit/Views/ClearStashes.axaml
@@ -8,8 +8,8 @@
              x:DataType="vm:ClearStashes">
   <StackPanel Orientation="Vertical" Margin="8,0,0,0">
     <TextBlock FontSize="18"
-				       Classes="bold"
-				       Text="{DynamicResource Text.ClearStashes}"/>
+               Classes="bold"
+               Text="{DynamicResource Text.ClearStashes}"/>
 
     <TextBlock Margin="0,16,0,8"
                Text="{DynamicResource Text.ClearStashes.Message}"
diff --git a/src/SourceGit/Views/Clone.axaml b/src/SourceGit/Views/Clone.axaml
index 3a00e618..627716b8 100644
--- a/src/SourceGit/Views/Clone.axaml
+++ b/src/SourceGit/Views/Clone.axaml
@@ -13,7 +13,7 @@
 
     <Grid Margin="8,16,0,0" Height="28" ColumnDefinitions="120,*">
       <TextBlock Grid.Column="0" HorizontalAlignment="Right" Margin="0,0,8,0" Text="{DynamicResource Text.Clone.RemoteURL}"/>
-      <TextBox Grid.Column="1" CornerRadius="3" Text="{Binding Remote, Mode=TwoWay}"/>
+      <TextBox Grid.Column="1" CornerRadius="3" Text="{Binding Remote, Mode=TwoWay}" v:AutoFocusBehaviour.IsEnabled="True"/>
     </Grid>
     <Grid Margin="8,4,0,0" Height="28" ColumnDefinitions="120,*" IsVisible="{Binding UseSSH}">
       <TextBlock Grid.Column="0" HorizontalAlignment="Right" Margin="0,0,8,0" Text="{DynamicResource Text.SSHKey}"/>
diff --git a/src/SourceGit/Views/CommitDetail.axaml b/src/SourceGit/Views/CommitDetail.axaml
index 095391d6..04972c42 100644
--- a/src/SourceGit/Views/CommitDetail.axaml
+++ b/src/SourceGit/Views/CommitDetail.axaml
@@ -23,21 +23,21 @@
 
         <!-- Change List -->
         <DataGrid Grid.Row="1"
-					        Background="Transparent"
-						      ItemsSource="{Binding Changes}"
-						      SelectionMode="Single"
-						      CanUserReorderColumns="False"
-						      CanUserResizeColumns="False"
-						      CanUserSortColumns="False"
-						      IsReadOnly="True"
-						      HeadersVisibility="None"
-						      Focusable="False"
-						      RowHeight="26"
-						      Margin="80,0,8,0"
-						      HorizontalScrollBarVisibility="Disabled"
-						      VerticalScrollBarVisibility="Auto"
-						      ContextRequested="OnChangeListContextRequested"
-						      DoubleTapped="OnChangeListDoubleTapped">
+                  Background="Transparent"
+                  ItemsSource="{Binding Changes}"
+                  SelectionMode="Single"
+                  CanUserReorderColumns="False"
+                  CanUserResizeColumns="False"
+                  CanUserSortColumns="False"
+                  IsReadOnly="True"
+                  HeadersVisibility="None"
+                  Focusable="False"
+                  RowHeight="26"
+                  Margin="80,0,8,0"
+                  HorizontalScrollBarVisibility="Disabled"
+                  VerticalScrollBarVisibility="Auto"
+                  ContextRequested="OnChangeListContextRequested"
+                  DoubleTapped="OnChangeListDoubleTapped">
           <DataGrid.Columns>
             <DataGridTemplateColumn Header="ICON">
               <DataGridTemplateColumn.CellTemplate>
diff --git a/src/SourceGit/Views/CreateBranch.axaml b/src/SourceGit/Views/CreateBranch.axaml
index 8c7b56e6..3028f81c 100644
--- a/src/SourceGit/Views/CreateBranch.axaml
+++ b/src/SourceGit/Views/CreateBranch.axaml
@@ -4,19 +4,20 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:m="using:SourceGit.Models"
              xmlns:vm="using:SourceGit.ViewModels"
+             xmlns:v="using:SourceGit.Views"
              xmlns:c="using:SourceGit.Converters"
              mc:Ignorable="d" d:DesignWidth="500" d:DesignHeight="450"
              x:Class="SourceGit.Views.CreateBranch"
              x:DataType="vm:CreateBranch">
   <StackPanel Orientation="Vertical" Margin="8,0">
     <TextBlock FontSize="18"
-				       Classes="bold"
-				       Text="{DynamicResource Text.CreateBranch}"/>
+               Classes="bold"
+               Text="{DynamicResource Text.CreateBranch}"/>
     <Grid Margin="0,16,0,0" RowDefinitions="32,32,32,32" ColumnDefinitions="150,*">
       <TextBlock Grid.Column="0"
-					       HorizontalAlignment="Right" VerticalAlignment="Center"
-					       Margin="0,0,8,0"
-					       Text="{DynamicResource Text.CreateBranch.BasedOn}"/>
+                 HorizontalAlignment="Right" VerticalAlignment="Center"
+                 Margin="0,0,8,0"
+                 Text="{DynamicResource Text.CreateBranch.BasedOn}"/>
       <ContentControl Grid.Column="1" Content="{Binding BasedOn}">
         <ContentControl.DataTemplates>
           <DataTemplate DataType="m:Branch">
@@ -44,19 +45,20 @@
       </ContentControl>
 
       <TextBlock Grid.Row="1" Grid.Column="0"
-					       HorizontalAlignment="Right" VerticalAlignment="Center"
-					       Margin="0,0,8,0"
-					       Text="{DynamicResource Text.CreateBranch.Name}"/>
+                 HorizontalAlignment="Right" VerticalAlignment="Center"
+                 Margin="0,0,8,0"
+                 Text="{DynamicResource Text.CreateBranch.Name}"/>
       <TextBox Grid.Row="1" Grid.Column="1"
                Height="26"
                VerticalAlignment="Center"
                CornerRadius="2"
-               Text="{Binding Name, Mode=TwoWay}"/>
+               Text="{Binding Name, Mode=TwoWay}"
+               v:AutoFocusBehaviour.IsEnabled="True"/>
 
       <TextBlock Grid.Row="2" Grid.Column="0"
-					       HorizontalAlignment="Right" VerticalAlignment="Center"
-					       Margin="0,0,8,0"
-					       Text="{DynamicResource Text.CreateBranch.LocalChanges}"/>
+                 HorizontalAlignment="Right" VerticalAlignment="Center"
+                 Margin="0,0,8,0"
+                 Text="{DynamicResource Text.CreateBranch.LocalChanges}"/>
       <StackPanel Grid.Row="2" Grid.Column="1" Orientation="Horizontal">
         <RadioButton Content="{DynamicResource Text.CreateBranch.LocalChanges.StashAndReply}"
                      GroupName="LocalChanges"
diff --git a/src/SourceGit/Views/CreateGroup.axaml b/src/SourceGit/Views/CreateGroup.axaml
index e909d536..05ec5bf2 100644
--- a/src/SourceGit/Views/CreateGroup.axaml
+++ b/src/SourceGit/Views/CreateGroup.axaml
@@ -3,6 +3,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:vm="using:SourceGit.ViewModels"
+             xmlns:v="using:SourceGit.Views"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="SourceGit.Views.CreateGroup"
              x:DataType="vm:CreateGroup">
@@ -11,7 +12,7 @@
 
     <Grid Margin="8,16,0,0" Height="28" ColumnDefinitions="Auto,*">
       <TextBlock Grid.Column="0" HorizontalAlignment="Right" Margin="8,0" Text="{DynamicResource Text.Name}"/>
-      <TextBox Grid.Column="1" CornerRadius="3" Text="{Binding Name, Mode=TwoWay}"/>
+      <TextBox Grid.Column="1" CornerRadius="3" v:AutoFocusBehaviour.IsEnabled="True" Text="{Binding Name, Mode=TwoWay}"/>
     </Grid>
   </StackPanel>
 </UserControl>
diff --git a/src/SourceGit/Views/CreateTag.axaml b/src/SourceGit/Views/CreateTag.axaml
index ff286944..ac0b20c5 100644
--- a/src/SourceGit/Views/CreateTag.axaml
+++ b/src/SourceGit/Views/CreateTag.axaml
@@ -4,19 +4,20 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:m="using:SourceGit.Models"
              xmlns:vm="using:SourceGit.ViewModels"
+             xmlns:v="using:SourceGit.Views"
              xmlns:c="using:SourceGit.Converters"
              mc:Ignorable="d" d:DesignWidth="500" d:DesignHeight="450"
              x:Class="SourceGit.Views.CreateTag"
              x:DataType="vm:CreateTag">
   <StackPanel Orientation="Vertical" Margin="8,0,0,0">
     <TextBlock FontSize="18"
-				       Classes="bold"
-				       Text="{DynamicResource Text.CreateTag}"/>
+               Classes="bold"
+               Text="{DynamicResource Text.CreateTag}"/>
     <Grid Margin="0,16,8,0" RowDefinitions="32,32,64" ColumnDefinitions="150,*">
       <TextBlock Grid.Column="0"
-					       HorizontalAlignment="Right" VerticalAlignment="Center"
-					       Margin="0,0,8,0"
-					       Text="{DynamicResource Text.CreateTag.BasedOn}"/>
+                 HorizontalAlignment="Right" VerticalAlignment="Center"
+                 Margin="0,0,8,0"
+                 Text="{DynamicResource Text.CreateTag.BasedOn}"/>
       <ContentControl Grid.Column="1" Content="{Binding BasedOn}">
         <ContentControl.DataTemplates>
           <DataTemplate DataType="m:Branch">
@@ -37,19 +38,20 @@
       </ContentControl>
 
       <TextBlock Grid.Row="1" Grid.Column="0"
-					       HorizontalAlignment="Right" VerticalAlignment="Center"
-					       Margin="0,0,8,0"
-					       Text="{DynamicResource Text.CreateTag.Name}"/>
+                 HorizontalAlignment="Right" VerticalAlignment="Center"
+                 Margin="0,0,8,0"
+                 Text="{DynamicResource Text.CreateTag.Name}"/>
       <TextBox Grid.Row="1" Grid.Column="1"
                Height="26"
                VerticalAlignment="Center"
                CornerRadius="2"
-               Text="{Binding TagName, Mode=TwoWay}"/>
+               Text="{Binding TagName, Mode=TwoWay}"
+               v:AutoFocusBehaviour.IsEnabled="True"/>
 
       <TextBlock Grid.Row="2" Grid.Column="0"
-					       HorizontalAlignment="Right" VerticalAlignment="Top"
-					       Margin="0,6,8,0"
-					       Text="{DynamicResource Text.CreateTag.Message}"/>
+                 HorizontalAlignment="Right" VerticalAlignment="Top"
+                 Margin="0,6,8,0"
+                 Text="{DynamicResource Text.CreateTag.Message}"/>
       <TextBox Grid.Row="2" Grid.Column="1"
                Height="56"
                AcceptsReturn="True" AcceptsTab="False"
diff --git a/src/SourceGit/Views/DeleteBranch.axaml b/src/SourceGit/Views/DeleteBranch.axaml
index 44de564e..7280a636 100644
--- a/src/SourceGit/Views/DeleteBranch.axaml
+++ b/src/SourceGit/Views/DeleteBranch.axaml
@@ -9,8 +9,8 @@
              x:DataType="vm:DeleteBranch">
   <StackPanel Orientation="Vertical" Margin="8,0">
     <TextBlock FontSize="18"
-				       Classes="bold"
-				       Text="{DynamicResource Text.DeleteBranch}"/>
+               Classes="bold"
+               Text="{DynamicResource Text.DeleteBranch}"/>
     <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,16,0,0">
       <TextBlock Text="{DynamicResource Text.DeleteBranch.Branch}"/>
       <Path Width="14" Height="14" Margin="8,0" Data="{StaticResource Icons.Branch}"/>
diff --git a/src/SourceGit/Views/DeleteRemote.axaml b/src/SourceGit/Views/DeleteRemote.axaml
index e2b0524d..ff112bf6 100644
--- a/src/SourceGit/Views/DeleteRemote.axaml
+++ b/src/SourceGit/Views/DeleteRemote.axaml
@@ -8,8 +8,8 @@
              x:DataType="vm:DeleteRemote">
   <StackPanel Orientation="Vertical" Margin="8,0">
     <TextBlock FontSize="18"
-				       Classes="bold"
-				       Text="{DynamicResource Text.DeleteRemote}"/>
+               Classes="bold"
+               Text="{DynamicResource Text.DeleteRemote}"/>
     <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,16,0,0">
       <TextBlock Text="{DynamicResource Text.DeleteRemote.Remote}"/>
       <Path Width="14" Height="14" Margin="8,6,8,0" Data="{StaticResource Icons.Remote}"/>
diff --git a/src/SourceGit/Views/DeleteRepositoryNode.axaml b/src/SourceGit/Views/DeleteRepositoryNode.axaml
index f7201c9c..82cd14dd 100644
--- a/src/SourceGit/Views/DeleteRepositoryNode.axaml
+++ b/src/SourceGit/Views/DeleteRepositoryNode.axaml
@@ -9,32 +9,32 @@
              x:DataType="vm:DeleteRepositoryNode">
   <StackPanel Orientation="Vertical" Margin="8,0,0,0">
     <TextBlock FontSize="18"
-				       Classes="bold"
-				       Text="{DynamicResource Text.DeleteRepositoryNode.TitleForGroup}"
-				       IsVisible="{Binding !Node.IsRepository}"/>
+               Classes="bold"
+               Text="{DynamicResource Text.DeleteRepositoryNode.TitleForGroup}"
+               IsVisible="{Binding !Node.IsRepository}"/>
     <TextBlock FontSize="18"
-				       Classes="bold"
-				       Text="{DynamicResource Text.DeleteRepositoryNode.TitleForRepository}"
-				       IsVisible="{Binding Node.IsRepository}"/>
+               Classes="bold"
+               Text="{DynamicResource Text.DeleteRepositoryNode.TitleForRepository}"
+               IsVisible="{Binding Node.IsRepository}"/>
 
     <Grid Margin="0,16,8,0" Height="28" ColumnDefinitions="120,*">
       <TextBlock Grid.Column="0"
-					       HorizontalAlignment="Right" VerticalAlignment="Center"
-					       Margin="0,0,8,0"
-					       Text="{DynamicResource Text.DeleteRepositoryNode.Target}"/>
+                 HorizontalAlignment="Right" VerticalAlignment="Center"
+                 Margin="0,0,8,0"
+                 Text="{DynamicResource Text.DeleteRepositoryNode.Target}"/>
       <StackPanel Grid.Column="1" Orientation="Horizontal">
         <Path Width="12" Height="12" Margin="0,0,8,0"
-					    Fill="{Binding Node.Bookmark, Converter={x:Static c:BookmarkConverters.ToBrush}}"
-					    StrokeThickness="{Binding Node.Bookmark, Converter={x:Static c:BookmarkConverters.ToStrokeThickness}}"
-					    Stroke="{DynamicResource Brush.FG1}"
-					    HorizontalAlignment="Left" VerticalAlignment="Center"
-					    Data="{StaticResource Icons.Bookmark}"
-					    IsVisible="{Binding Node.IsRepository}"/>
+              Fill="{Binding Node.Bookmark, Converter={x:Static c:BookmarkConverters.ToBrush}}"
+              StrokeThickness="{Binding Node.Bookmark, Converter={x:Static c:BookmarkConverters.ToStrokeThickness}}"
+              Stroke="{DynamicResource Brush.FG1}"
+              HorizontalAlignment="Left" VerticalAlignment="Center"
+              Data="{StaticResource Icons.Bookmark}"
+              IsVisible="{Binding Node.IsRepository}"/>
         <Path Width="12" Height="12" Margin="0,0,8,0"
-					    Fill="{DynamicResource Brush.FG1}"
-					    HorizontalAlignment="Left" VerticalAlignment="Center"
-					    Data="{StaticResource Icons.Folder}"
-					    IsVisible="{Binding !Node.IsRepository}"/>
+              Fill="{DynamicResource Brush.FG1}"
+              HorizontalAlignment="Left" VerticalAlignment="Center"
+              Data="{StaticResource Icons.Folder}"
+              IsVisible="{Binding !Node.IsRepository}"/>
 
         <TextBlock VerticalAlignment="Center" Text="{Binding Node.Name}"/>
         <TextBlock Margin="8,0" HorizontalAlignment="Right" VerticalAlignment="Center" Foreground="{DynamicResource Brush.FG2}" Text="{Binding Node.Id}" IsVisible="{Binding Node.IsRepository}"/>
diff --git a/src/SourceGit/Views/DeleteSubmodule.axaml b/src/SourceGit/Views/DeleteSubmodule.axaml
index 20934b45..5f609e12 100644
--- a/src/SourceGit/Views/DeleteSubmodule.axaml
+++ b/src/SourceGit/Views/DeleteSubmodule.axaml
@@ -9,16 +9,16 @@
              x:DataType="vm:DeleteSubmodule">
   <StackPanel Orientation="Vertical" Margin="8,0">
     <TextBlock FontSize="18"
-				       Classes="bold"
-				       Text="{DynamicResource Text.DeleteSubmodule}"/>
+               Classes="bold"
+               Text="{DynamicResource Text.DeleteSubmodule}"/>
     <StackPanel Orientation="Horizontal" Margin="0,16,0,0" Height="28" HorizontalAlignment="Center">
       <TextBlock Grid.Column="0"
-					       HorizontalAlignment="Right" VerticalAlignment="Center"
-					       Margin="0,0,8,0"
-					       Text="{DynamicResource Text.DeleteSubmodule.Path}"/>
+                 HorizontalAlignment="Right" VerticalAlignment="Center"
+                 Margin="0,0,8,0"
+                 Text="{DynamicResource Text.DeleteSubmodule.Path}"/>
       <Path Width="12" Height="12"
-					  HorizontalAlignment="Left" VerticalAlignment="Center"
-					  Data="{StaticResource Icons.Submodule}"/>
+            HorizontalAlignment="Left" VerticalAlignment="Center"
+            Data="{StaticResource Icons.Submodule}"/>
 
       <TextBlock VerticalAlignment="Center" Text="{Binding Submodule}" Margin="8,0,0,0"/>
     </StackPanel>
diff --git a/src/SourceGit/Views/DeleteTag.axaml b/src/SourceGit/Views/DeleteTag.axaml
index fa053f10..0a00947c 100644
--- a/src/SourceGit/Views/DeleteTag.axaml
+++ b/src/SourceGit/Views/DeleteTag.axaml
@@ -8,13 +8,13 @@
              x:DataType="vm:DeleteTag">
   <StackPanel Orientation="Vertical" Margin="8,0">
     <TextBlock FontSize="18"
-				       Classes="bold"
-				       Text="{DynamicResource Text.DeleteTag}"/>
+               Classes="bold"
+               Text="{DynamicResource Text.DeleteTag}"/>
     <Grid Margin="0,16,0,0" RowDefinitions="32,32" ColumnDefinitions="150,*">
       <TextBlock Grid.Column="0"
-					       HorizontalAlignment="Right" VerticalAlignment="Center"
-					       Margin="0,0,8,0"
-					       Text="{DynamicResource Text.DeleteTag.Tag}"/>
+                 HorizontalAlignment="Right" VerticalAlignment="Center"
+                 Margin="0,0,8,0"
+                 Text="{DynamicResource Text.DeleteTag.Tag}"/>
 
       <StackPanel Grid.Column="1" Orientation="Horizontal">
         <Path Width="14" Height="14" Data="{StaticResource Icons.Tag}"/>
diff --git a/src/SourceGit/Views/Discard.axaml b/src/SourceGit/Views/Discard.axaml
index 373b3057..7c066634 100644
--- a/src/SourceGit/Views/Discard.axaml
+++ b/src/SourceGit/Views/Discard.axaml
@@ -9,8 +9,8 @@
              x:DataType="vm:Discard">
   <StackPanel Orientation="Vertical" Margin="8,0,0,0">
     <TextBlock FontSize="18"
-				       Classes="bold"
-				       Text="{DynamicResource Text.Discard}"/>
+               Classes="bold"
+               Text="{DynamicResource Text.Discard}"/>
 
     <Grid Margin="0,16,0,8" RowDefinitions="32,32" ColumnDefinitions="150,*">
       <TextBlock Grid.Row="0" Grid.Column="0" Margin="0,0,8,0" HorizontalAlignment="Right" Text="{DynamicResource Text.Discard.Changes}"/>
diff --git a/src/SourceGit/Views/DropStash.axaml b/src/SourceGit/Views/DropStash.axaml
index 9717274c..44cbee67 100644
--- a/src/SourceGit/Views/DropStash.axaml
+++ b/src/SourceGit/Views/DropStash.axaml
@@ -9,17 +9,17 @@
              x:DataType="vm:DropStash">
   <StackPanel Orientation="Vertical" Margin="8,0,0,0">
     <TextBlock FontSize="18"
-				       Classes="bold"
-				       Text="{DynamicResource Text.StashDropConfirm}"/>
+               Classes="bold"
+               Text="{DynamicResource Text.StashDropConfirm}"/>
     <Grid Margin="0,16,8,0" Height="28" ColumnDefinitions="120,*">
       <TextBlock Grid.Column="0"
-					       HorizontalAlignment="Right" VerticalAlignment="Center"
-					       Margin="0,0,8,0"
-					       Text="{DynamicResource Text.StashDropConfirm.Label}"/>
+                 HorizontalAlignment="Right" VerticalAlignment="Center"
+                 Margin="0,0,8,0"
+                 Text="{DynamicResource Text.StashDropConfirm.Label}"/>
       <StackPanel Grid.Column="1" Orientation="Horizontal">
         <Path Width="12" Height="12" Margin="0,0,8,0"
-					    HorizontalAlignment="Left" VerticalAlignment="Center"
-					    Data="{StaticResource Icons.Stashes}"/>
+              HorizontalAlignment="Left" VerticalAlignment="Center"
+              Data="{StaticResource Icons.Stashes}"/>
 
         <TextBlock VerticalAlignment="Center" Text="{Binding Stash.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange"/>
         <TextBlock VerticalAlignment="Center" Text="{Binding Stash.Message}" Margin="8,0,0,0"/>
diff --git a/src/SourceGit/Views/EditRemote.axaml b/src/SourceGit/Views/EditRemote.axaml
index 6c41b3dc..d719b585 100644
--- a/src/SourceGit/Views/EditRemote.axaml
+++ b/src/SourceGit/Views/EditRemote.axaml
@@ -4,31 +4,33 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:m="using:SourceGit.Models"
              xmlns:vm="using:SourceGit.ViewModels"
+             xmlns:v="using:SourceGit.Views"
              xmlns:c="using:SourceGit.Converters"
              mc:Ignorable="d" d:DesignWidth="500" d:DesignHeight="450"
              x:Class="SourceGit.Views.EditRemote"
              x:DataType="vm:EditRemote">
   <StackPanel Orientation="Vertical" Margin="8,0">
     <TextBlock FontSize="18"
-				       Classes="bold"
-				       Text="{DynamicResource Text.Remote.AddTitle}"/>
+               Classes="bold"
+               Text="{DynamicResource Text.Remote.AddTitle}"/>
 
     <Grid Margin="0,16,0,0" RowDefinitions="32,32,Auto" ColumnDefinitions="150,*">
       <TextBlock Grid.Row="0" Grid.Column="0"
-					       HorizontalAlignment="Right" VerticalAlignment="Center"
-					       Margin="0,0,8,0"
-					       Text="{DynamicResource Text.Remote.Name}"/>
+                 HorizontalAlignment="Right" VerticalAlignment="Center"
+                 Margin="0,0,8,0"
+                 Text="{DynamicResource Text.Remote.Name}"/>
       <TextBox Grid.Row="0" Grid.Column="1"
                Height="26"
                VerticalAlignment="Center"
                CornerRadius="2"
                Watermark="{DynamicResource Text.Remote.Name.Placeholder}"
-               Text="{Binding Name, Mode=TwoWay}"/>
+               Text="{Binding Name, Mode=TwoWay}"
+               v:AutoFocusBehaviour.IsEnabled="True"/>
 
       <TextBlock Grid.Row="1" Grid.Column="0"
-					       HorizontalAlignment="Right" VerticalAlignment="Center"
-					       Margin="0,0,8,0"
-					       Text="{DynamicResource Text.Remote.URL}"/>
+                 HorizontalAlignment="Right" VerticalAlignment="Center"
+                 Margin="0,0,8,0"
+                 Text="{DynamicResource Text.Remote.URL}"/>
       <TextBox Grid.Row="1" Grid.Column="1"
                Height="26"
                VerticalAlignment="Center"
@@ -37,9 +39,9 @@
                Text="{Binding Url, Mode=TwoWay}"/>
 
       <TextBlock Grid.Row="2" Grid.Column="0"
-					       HorizontalAlignment="Right" VerticalAlignment="Center"
-					       Margin="0,0,8,0"
-					       Text="{DynamicResource Text.SSHKey}"
+                 HorizontalAlignment="Right" VerticalAlignment="Center"
+                 Margin="0,0,8,0"
+                 Text="{DynamicResource Text.SSHKey}"
                  IsVisible="{Binding UseSSH}"/>
       <TextBox Grid.Row="2" Grid.Column="1"
                x:Name="txtSSHKey"
diff --git a/src/SourceGit/Views/EditRepositoryNode.axaml b/src/SourceGit/Views/EditRepositoryNode.axaml
index d7847548..4605ed27 100644
--- a/src/SourceGit/Views/EditRepositoryNode.axaml
+++ b/src/SourceGit/Views/EditRepositoryNode.axaml
@@ -27,7 +27,7 @@
     </Grid>
     <Grid Height="28" Margin="8,4,0,0" ColumnDefinitions="120,*">
       <TextBlock Grid.Column="0" HorizontalAlignment="Right" Margin="0,0,8,0" Text="{DynamicResource Text.EditRepositoryNode.Name}"/>
-      <TextBox Grid.Column="1" CornerRadius="3" Text="{Binding Name, Mode=TwoWay}"/>
+      <TextBox Grid.Column="1" CornerRadius="3" Text="{Binding Name, Mode=TwoWay}" v:AutoFocusBehaviour.IsEnabled="True"/>
     </Grid>
     <Grid Height="28" Margin="8,4,0,0" ColumnDefinitions="120,*" IsVisible="{Binding IsRepository}">
       <TextBlock Grid.Column="0" HorizontalAlignment="Right" Margin="0,0,8,0" Text="{DynamicResource Text.EditRepositoryNode.Bookmark}"/>
diff --git a/src/SourceGit/Views/FastForwardWithoutCheckout.axaml b/src/SourceGit/Views/FastForwardWithoutCheckout.axaml
index 8b8f7451..cb33c09e 100644
--- a/src/SourceGit/Views/FastForwardWithoutCheckout.axaml
+++ b/src/SourceGit/Views/FastForwardWithoutCheckout.axaml
@@ -9,8 +9,8 @@
              x:DataType="vm:FastForwardWithoutCheckout">
   <StackPanel Orientation="Vertical" Margin="8,0">
     <TextBlock FontSize="18"
-				       Classes="bold"
-				       Text="{DynamicResource Text.FastForwardWithoutCheck}"/>
+               Classes="bold"
+               Text="{DynamicResource Text.FastForwardWithoutCheck}"/>
     <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,16,0,0">
       <Path Width="14" Height="14" Data="{StaticResource Icons.Branch}"/>
       <TextBlock Text="{Binding Local.Name}" Margin="8,0,0,0"/>
diff --git a/src/SourceGit/Views/Fetch.axaml b/src/SourceGit/Views/Fetch.axaml
index 08da55d6..202a96fa 100644
--- a/src/SourceGit/Views/Fetch.axaml
+++ b/src/SourceGit/Views/Fetch.axaml
@@ -10,13 +10,13 @@
              x:DataType="vm:Fetch">
   <StackPanel Orientation="Vertical" Margin="8,0">
     <TextBlock FontSize="18"
-				       Classes="bold"
-				       Text="{DynamicResource Text.Fetch.Title}"/>
+               Classes="bold"
+               Text="{DynamicResource Text.Fetch.Title}"/>
     <Grid Margin="0,16,0,0" RowDefinitions="32,32,32" ColumnDefinitions="150,*">
       <TextBlock Grid.Column="0"
-					       HorizontalAlignment="Right" VerticalAlignment="Center"
-					       Margin="0,0,8,0"
-					       Text="{DynamicResource Text.Fetch.Remote}"/>
+                 HorizontalAlignment="Right" VerticalAlignment="Center"
+                 Margin="0,0,8,0"
+                 Text="{DynamicResource Text.Fetch.Remote}"/>
       <ComboBox Grid.Column="1"
                 Height="28" Padding="8,0"
                 VerticalAlignment="Center" HorizontalAlignment="Stretch"
diff --git a/src/SourceGit/Views/GitFlowFinish.axaml b/src/SourceGit/Views/GitFlowFinish.axaml
index f5527c67..9690c22c 100644
--- a/src/SourceGit/Views/GitFlowFinish.axaml
+++ b/src/SourceGit/Views/GitFlowFinish.axaml
@@ -10,22 +10,22 @@
              x:DataType="vm:GitFlowFinish">
   <StackPanel Orientation="Vertical" Margin="8,0">
     <TextBlock FontSize="18"
-				       Classes="bold"
-				       Text="{DynamicResource Text.GitFlow.FinishFeature}"
+               Classes="bold"
+               Text="{DynamicResource Text.GitFlow.FinishFeature}"
                IsVisible="{Binding IsFeature}"/>
     <TextBlock FontSize="18"
-				       Classes="bold"
-				       Text="{DynamicResource Text.GitFlow.FinishRelease}"
+               Classes="bold"
+               Text="{DynamicResource Text.GitFlow.FinishRelease}"
                IsVisible="{Binding IsRelease}"/>
     <TextBlock FontSize="18"
-				       Classes="bold"
-				       Text="{DynamicResource Text.GitFlow.FinishHotfix}"
+               Classes="bold"
+               Text="{DynamicResource Text.GitFlow.FinishHotfix}"
                IsVisible="{Binding IsHotfix}"/>
     <Grid Margin="0,16,0,0" RowDefinitions="32,32" ColumnDefinitions="150,*">
       <TextBlock Grid.Column="0"
-					       HorizontalAlignment="Right" VerticalAlignment="Center"
-					       Margin="0,0,8,0"
-					       Text="{DynamicResource Text.GitFlow.FinishTarget}"/>
+                 HorizontalAlignment="Right" VerticalAlignment="Center"
+                 Margin="0,0,8,0"
+                 Text="{DynamicResource Text.GitFlow.FinishTarget}"/>
       <StackPanel Grid.Column="1" Orientation="Horizontal">
         <Path Width="14" Height="14" Data="{StaticResource Icons.Branch}"/>
         <TextBlock Text="{Binding Branch.Name}" Margin="8,0,0,0"/>
diff --git a/src/SourceGit/Views/GitFlowStart.axaml b/src/SourceGit/Views/GitFlowStart.axaml
index cc1ccb89..211d9fe8 100644
--- a/src/SourceGit/Views/GitFlowStart.axaml
+++ b/src/SourceGit/Views/GitFlowStart.axaml
@@ -4,34 +4,36 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:m="using:SourceGit.Models"
              xmlns:vm="using:SourceGit.ViewModels"
+             xmlns:v="using:SourceGit.Views"
              xmlns:c="using:SourceGit.Converters"
              mc:Ignorable="d" d:DesignWidth="500" d:DesignHeight="450"
              x:Class="SourceGit.Views.GitFlowStart"
              x:DataType="vm:GitFlowStart">
   <StackPanel Orientation="Vertical" Margin="8,0">
     <TextBlock FontSize="18"
-				       Classes="bold"
-				       Text="{DynamicResource Text.GitFlow.StartFeatureTitle}"
+               Classes="bold"
+               Text="{DynamicResource Text.GitFlow.StartFeatureTitle}"
                IsVisible="{Binding IsFeature}"/>
     <TextBlock FontSize="18"
-				       Classes="bold"
-				       Text="{DynamicResource Text.GitFlow.StartReleaseTitle}"
+               Classes="bold"
+               Text="{DynamicResource Text.GitFlow.StartReleaseTitle}"
                IsVisible="{Binding IsRelease}"/>
     <TextBlock FontSize="18"
-				       Classes="bold"
-				       Text="{DynamicResource Text.GitFlow.StartHotfixTitle}"
+               Classes="bold"
+               Text="{DynamicResource Text.GitFlow.StartHotfixTitle}"
                IsVisible="{Binding IsHotfix}"/>
     <Grid Margin="0,16,0,0" ColumnDefinitions="150,*">
       <TextBlock Grid.Column="0"
-					       HorizontalAlignment="Right" VerticalAlignment="Center"
-					       Margin="0,0,8,0"
-					       Text="{Binding Prefix}"/>
+                 HorizontalAlignment="Right" VerticalAlignment="Center"
+                 Margin="0,0,8,0"
+                 Text="{Binding Prefix}"/>
       <TextBox Grid.Column="1"
                Height="26"
                VerticalAlignment="Center"
                CornerRadius="2"
                Watermark="{DynamicResource Text.GitFlow.StartPlaceholder}"
-               Text="{Binding Name, Mode=TwoWay}"/>
+               Text="{Binding Name, Mode=TwoWay}"
+               v:AutoFocusBehaviour.IsEnabled="True"/>
     </Grid>
   </StackPanel>
 </UserControl>
diff --git a/src/SourceGit/Views/Init.axaml b/src/SourceGit/Views/Init.axaml
index d74969eb..6b35bc82 100644
--- a/src/SourceGit/Views/Init.axaml
+++ b/src/SourceGit/Views/Init.axaml
@@ -8,18 +8,18 @@
              x:DataType="vm:Init">
   <StackPanel Orientation="Vertical" Margin="8,0,0,0">
     <TextBlock FontSize="18"
-				       Classes="bold"
-				       Text="{DynamicResource Text.Init}"/>
+               Classes="bold"
+               Text="{DynamicResource Text.Init}"/>
     <Grid Margin="0,16,8,0" RowDefinitions="28,28" ColumnDefinitions="120,*">
       <TextBlock Grid.Row="0" Grid.Column="0"
-					   Text="{DynamicResource Text.Init.Path}"
-					   HorizontalAlignment="Right" VerticalAlignment="Center"
-					   Margin="0,0,8,0"/>
+             Text="{DynamicResource Text.Init.Path}"
+             HorizontalAlignment="Right" VerticalAlignment="Center"
+             Margin="0,0,8,0"/>
       <TextBlock Grid.Row="0" Grid.Column="1"
-					   Text="{Binding TargetPath}"/>
+             Text="{Binding TargetPath}"/>
       <TextBlock Grid.Row="1" Grid.Column="1"
-					   Text="{DynamicResource Text.Init.Tip}"
-					   Foreground="{DynamicResource Brush.FG2}"/>
+             Text="{DynamicResource Text.Init.Tip}"
+             Foreground="{DynamicResource Brush.FG2}"/>
     </Grid>
   </StackPanel>
 </UserControl>
diff --git a/src/SourceGit/Views/InitGitFlow.axaml b/src/SourceGit/Views/InitGitFlow.axaml
index 6fb6e39f..83faf66f 100644
--- a/src/SourceGit/Views/InitGitFlow.axaml
+++ b/src/SourceGit/Views/InitGitFlow.axaml
@@ -4,29 +4,31 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:m="using:SourceGit.Models"
              xmlns:vm="using:SourceGit.ViewModels"
+             xmlns:v="using:SourceGit.Views"
              xmlns:c="using:SourceGit.Converters"
              mc:Ignorable="d" d:DesignWidth="500" d:DesignHeight="450"
              x:Class="SourceGit.Views.InitGitFlow"
              x:DataType="vm:InitGitFlow">
   <StackPanel Orientation="Vertical" Margin="8,0">
     <TextBlock FontSize="18"
-				       Classes="bold"
-				       Text="{DynamicResource Text.GitFlow.Init}"/>
+               Classes="bold"
+               Text="{DynamicResource Text.GitFlow.Init}"/>
     <Grid Margin="0,16,0,0" RowDefinitions="32,32,8,32,32,32,32" ColumnDefinitions="150,*">
       <TextBlock Grid.Row="0" Grid.Column="0"
-					       HorizontalAlignment="Right" VerticalAlignment="Center"
-					       Margin="0,0,8,0"
-					       Text="{DynamicResource Text.GitFlow.ProductionBranch}"/>
+                 HorizontalAlignment="Right" VerticalAlignment="Center"
+                 Margin="0,0,8,0"
+                 Text="{DynamicResource Text.GitFlow.ProductionBranch}"/>
       <TextBox Grid.Row="0" Grid.Column="1"
                Height="26"
                VerticalAlignment="Center"
                CornerRadius="2"
-               Text="{Binding Master, Mode=TwoWay}"/>
+               Text="{Binding Master, Mode=TwoWay}"
+               v:AutoFocusBehaviour.IsEnabled="True"/>
 
       <TextBlock Grid.Row="1" Grid.Column="0"
-					       HorizontalAlignment="Right" VerticalAlignment="Center"
-					       Margin="0,0,8,0"
-					       Text="{DynamicResource Text.GitFlow.DevelopBranch}"/>
+                 HorizontalAlignment="Right" VerticalAlignment="Center"
+                 Margin="0,0,8,0"
+                 Text="{DynamicResource Text.GitFlow.DevelopBranch}"/>
       <TextBox Grid.Row="1" Grid.Column="1"
                Height="26"
                VerticalAlignment="Center"
@@ -39,9 +41,9 @@
                  VerticalAlignment="Center"/>
 
       <TextBlock Grid.Row="3" Grid.Column="0"
-					       HorizontalAlignment="Right" VerticalAlignment="Center"
-					       Margin="0,0,8,0"
-					       Text="{DynamicResource Text.GitFlow.FeaturePrefix}"/>
+                 HorizontalAlignment="Right" VerticalAlignment="Center"
+                 Margin="0,0,8,0"
+                 Text="{DynamicResource Text.GitFlow.FeaturePrefix}"/>
       <TextBox Grid.Row="3" Grid.Column="1"
                Height="26"
                VerticalAlignment="Center"
@@ -49,9 +51,9 @@
                Text="{Binding FeturePrefix, Mode=TwoWay}"/>
 
       <TextBlock Grid.Row="4" Grid.Column="0"
-					       HorizontalAlignment="Right" VerticalAlignment="Center"
-					       Margin="0,0,8,0"
-					       Text="{DynamicResource Text.GitFlow.ReleasePrefix}"/>
+                 HorizontalAlignment="Right" VerticalAlignment="Center"
+                 Margin="0,0,8,0"
+                 Text="{DynamicResource Text.GitFlow.ReleasePrefix}"/>
       <TextBox Grid.Row="4" Grid.Column="1"
                Height="26"
                VerticalAlignment="Center"
@@ -59,9 +61,9 @@
                Text="{Binding ReleasePrefix, Mode=TwoWay}"/>
 
       <TextBlock Grid.Row="5" Grid.Column="0"
-					       HorizontalAlignment="Right" VerticalAlignment="Center"
-					       Margin="0,0,8,0"
-					       Text="{DynamicResource Text.GitFlow.HotfixPrefix}"/>
+                 HorizontalAlignment="Right" VerticalAlignment="Center"
+                 Margin="0,0,8,0"
+                 Text="{DynamicResource Text.GitFlow.HotfixPrefix}"/>
       <TextBox Grid.Row="5" Grid.Column="1"
                Height="26"
                VerticalAlignment="Center"
@@ -69,9 +71,9 @@
                Text="{Binding HotfixPrefix, Mode=TwoWay}"/>
 
       <TextBlock Grid.Row="6" Grid.Column="0"
-					       HorizontalAlignment="Right" VerticalAlignment="Center"
-					       Margin="0,0,8,0"
-					       Text="{DynamicResource Text.GitFlow.TagPrefix}"/>
+                 HorizontalAlignment="Right" VerticalAlignment="Center"
+                 Margin="0,0,8,0"
+                 Text="{DynamicResource Text.GitFlow.TagPrefix}"/>
       <TextBox Grid.Row="6" Grid.Column="1"
                Height="26"
                VerticalAlignment="Center"
diff --git a/src/SourceGit/Views/Launcher.axaml b/src/SourceGit/Views/Launcher.axaml
index 37745a96..cb396c43 100644
--- a/src/SourceGit/Views/Launcher.axaml
+++ b/src/SourceGit/Views/Launcher.axaml
@@ -284,7 +284,8 @@
                     <Button Classes="flat primary"
                             Width="80"
                             Content="{DynamicResource Text.Sure}"
-                            Click="OnPopupSure"/>
+                            Click="OnPopupSure"
+                            HotKey="Enter"/>
                     <Button Classes="flat"
                             Width="80"
                             Margin="8,0,0,0"
diff --git a/src/SourceGit/Views/Merge.axaml b/src/SourceGit/Views/Merge.axaml
index e73017f6..8ab08c2a 100644
--- a/src/SourceGit/Views/Merge.axaml
+++ b/src/SourceGit/Views/Merge.axaml
@@ -8,31 +8,31 @@
              x:DataType="vm:Merge">
   <StackPanel Orientation="Vertical" Margin="8,0">
     <TextBlock FontSize="18"
-				       Classes="bold"
-				       Text="{DynamicResource Text.Merge}"/>
+               Classes="bold"
+               Text="{DynamicResource Text.Merge}"/>
     <Grid Margin="0,16,0,0" RowDefinitions="32,32,32" ColumnDefinitions="150,*">
       <TextBlock Grid.Row="0" Grid.Column="0"
-					       HorizontalAlignment="Right" VerticalAlignment="Center"
-					       Margin="0,0,8,0"
-					       Text="{DynamicResource Text.Merge.Source}"/>
+                 HorizontalAlignment="Right" VerticalAlignment="Center"
+                 Margin="0,0,8,0"
+                 Text="{DynamicResource Text.Merge.Source}"/>
       <StackPanel Grid.Row="0" Grid.Column="1" Orientation="Horizontal" Height="20" VerticalAlignment="Center">
         <Path Margin="0,0,8,0" Width="14" Height="14" Fill="{DynamicResource Brush.FG1}" Data="{StaticResource Icons.Branch}"/>
         <TextBlock Text="{Binding Source}"/>
       </StackPanel>
 
       <TextBlock Grid.Row="1" Grid.Column="0"
-					       HorizontalAlignment="Right" VerticalAlignment="Center"
-					       Margin="0,0,8,0"
-					       Text="{DynamicResource Text.Merge.Into}"/>
+                 HorizontalAlignment="Right" VerticalAlignment="Center"
+                 Margin="0,0,8,0"
+                 Text="{DynamicResource Text.Merge.Into}"/>
       <StackPanel Grid.Row="1" Grid.Column="1" Orientation="Horizontal" Height="20" VerticalAlignment="Center">
         <Path Margin="0,0,8,0" Width="14" Height="14" Fill="{DynamicResource Brush.FG1}" Data="{StaticResource Icons.Branch}"/>
         <TextBlock Text="{Binding Into}"/>
       </StackPanel>
 
       <TextBlock Grid.Row="2" Grid.Column="0"
-					       HorizontalAlignment="Right" VerticalAlignment="Center"
-					       Margin="0,0,8,0"
-					       Text="{DynamicResource Text.Merge.Mode}"/>
+                 HorizontalAlignment="Right" VerticalAlignment="Center"
+                 Margin="0,0,8,0"
+                 Text="{DynamicResource Text.Merge.Mode}"/>
       <ComboBox Grid.Row="2" Grid.Column="1"
                 Height="28" Padding="8,0"
                 VerticalAlignment="Center" HorizontalAlignment="Stretch"
diff --git a/src/SourceGit/Views/PruneRemote.axaml b/src/SourceGit/Views/PruneRemote.axaml
index 6e8647f5..2b3dbcf0 100644
--- a/src/SourceGit/Views/PruneRemote.axaml
+++ b/src/SourceGit/Views/PruneRemote.axaml
@@ -8,8 +8,8 @@
              x:DataType="vm:PruneRemote">
   <StackPanel Orientation="Vertical" Margin="8,0">
     <TextBlock FontSize="18"
-				       Classes="bold"
-				       Text="{DynamicResource Text.RemoteCM.Prune}"/>
+               Classes="bold"
+               Text="{DynamicResource Text.RemoteCM.Prune}"/>
     <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,16,0,0">
       <TextBlock Text="{DynamicResource Text.RemoteCM.Prune.Target}"/>
       <Path Width="14" Height="14" Margin="8,6,8,0" Data="{StaticResource Icons.Remote}"/>
diff --git a/src/SourceGit/Views/Pull.axaml b/src/SourceGit/Views/Pull.axaml
index aadae21f..e885b104 100644
--- a/src/SourceGit/Views/Pull.axaml
+++ b/src/SourceGit/Views/Pull.axaml
@@ -10,13 +10,13 @@
              x:DataType="vm:Pull">
   <StackPanel Orientation="Vertical" Margin="8,0">
     <TextBlock FontSize="18"
-				       Classes="bold"
-				       Text="{DynamicResource Text.Pull.Title}"/>
+               Classes="bold"
+               Text="{DynamicResource Text.Pull.Title}"/>
     <Grid Margin="0,16,0,0" RowDefinitions="32,32,32,32,32" ColumnDefinitions="150,*">
       <TextBlock Grid.Column="0"
-					       HorizontalAlignment="Right" VerticalAlignment="Center"
-					       Margin="0,0,8,0"
-					       Text="{DynamicResource Text.Pull.Remote}"/>
+                 HorizontalAlignment="Right" VerticalAlignment="Center"
+                 Margin="0,0,8,0"
+                 Text="{DynamicResource Text.Pull.Remote}"/>
       <ComboBox Grid.Column="1"
                 Height="28" Padding="8,0"
                 VerticalAlignment="Center" HorizontalAlignment="Stretch"
@@ -34,9 +34,9 @@
       </ComboBox>
 
       <TextBlock Grid.Row="1" Grid.Column="0"
-					       HorizontalAlignment="Right" VerticalAlignment="Center"
-					       Margin="0,0,8,0"
-					       Text="{DynamicResource Text.Pull.Branch}"/>
+                 HorizontalAlignment="Right" VerticalAlignment="Center"
+                 Margin="0,0,8,0"
+                 Text="{DynamicResource Text.Pull.Branch}"/>
       <ComboBox Grid.Row="1" Grid.Column="1"
                 Height="28" Padding="8,0"
                 VerticalAlignment="Center" HorizontalAlignment="Stretch"
@@ -54,9 +54,9 @@
       </ComboBox>
 
       <TextBlock Grid.Row="2" Grid.Column="0"
-					       HorizontalAlignment="Right" VerticalAlignment="Center"
-					       Margin="0,0,8,0"
-					       Text="{DynamicResource Text.Pull.Into}"/>
+                 HorizontalAlignment="Right" VerticalAlignment="Center"
+                 Margin="0,0,8,0"
+                 Text="{DynamicResource Text.Pull.Into}"/>
       <StackPanel Grid.Row="2" Grid.Column="1" Orientation="Horizontal" Height="20" VerticalAlignment="Center">
         <Path Margin="0,0,8,0" Width="14" Height="14" Fill="{DynamicResource Brush.FG1}" Data="{StaticResource Icons.Branch}"/>
         <TextBlock Text="{Binding Current.Name}"/>
diff --git a/src/SourceGit/Views/Push.axaml b/src/SourceGit/Views/Push.axaml
index 49da4cb7..bb76ad26 100644
--- a/src/SourceGit/Views/Push.axaml
+++ b/src/SourceGit/Views/Push.axaml
@@ -10,14 +10,14 @@
              x:DataType="vm:Push">
   <StackPanel Orientation="Vertical" Margin="8,0">
     <TextBlock FontSize="18"
-				       Classes="bold"
-				       Text="{DynamicResource Text.Push.Title}"/>
+               Classes="bold"
+               Text="{DynamicResource Text.Push.Title}"/>
 
     <Grid Margin="0,16,0,0" RowDefinitions="32,32,32,32,32" ColumnDefinitions="150,*">
       <TextBlock Grid.Column="0"
-					       HorizontalAlignment="Right" VerticalAlignment="Center"
-					       Margin="0,0,8,0"
-					       Text="{DynamicResource Text.Push.Local}"/>
+                 HorizontalAlignment="Right" VerticalAlignment="Center"
+                 Margin="0,0,8,0"
+                 Text="{DynamicResource Text.Push.Local}"/>
       <ComboBox Grid.Column="1"
                 Height="28" Padding="8,0"
                 VerticalAlignment="Center" HorizontalAlignment="Stretch"
@@ -35,9 +35,9 @@
       </ComboBox>
 
       <TextBlock Grid.Row="1" Grid.Column="0"
-					       HorizontalAlignment="Right" VerticalAlignment="Center"
-					       Margin="0,0,8,0"
-					       Text="{DynamicResource Text.Push.Remote}"/>
+                 HorizontalAlignment="Right" VerticalAlignment="Center"
+                 Margin="0,0,8,0"
+                 Text="{DynamicResource Text.Push.Remote}"/>
       <ComboBox Grid.Row="1" Grid.Column="1"
                 Height="28" Padding="8,0"
                 VerticalAlignment="Center" HorizontalAlignment="Stretch"
@@ -54,9 +54,9 @@
       </ComboBox>
 
       <TextBlock Grid.Row="2" Grid.Column="0"
-					       HorizontalAlignment="Right" VerticalAlignment="Center"
-					       Margin="0,0,8,0"
-					       Text="{DynamicResource Text.Push.To}"/>
+                 HorizontalAlignment="Right" VerticalAlignment="Center"
+                 Margin="0,0,8,0"
+                 Text="{DynamicResource Text.Push.To}"/>
       <ComboBox Grid.Row="2" Grid.Column="1"
                 Height="28" Padding="8,0"
                 VerticalAlignment="Center" HorizontalAlignment="Stretch"
diff --git a/src/SourceGit/Views/PushTag.axaml b/src/SourceGit/Views/PushTag.axaml
index c4adb08a..f62d538a 100644
--- a/src/SourceGit/Views/PushTag.axaml
+++ b/src/SourceGit/Views/PushTag.axaml
@@ -10,13 +10,13 @@
              x:DataType="vm:PushTag">
   <StackPanel Orientation="Vertical" Margin="8,0">
     <TextBlock FontSize="18"
-				       Classes="bold"
-				       Text="{DynamicResource Text.PushTag}"/>
+               Classes="bold"
+               Text="{DynamicResource Text.PushTag}"/>
     <Grid Margin="0,16,0,0" RowDefinitions="32,32" ColumnDefinitions="150,*">
       <TextBlock Grid.Column="0"
-					       HorizontalAlignment="Right" VerticalAlignment="Center"
-					       Margin="0,0,8,0"
-					       Text="{DynamicResource Text.PushTag.Tag}"/>
+                 HorizontalAlignment="Right" VerticalAlignment="Center"
+                 Margin="0,0,8,0"
+                 Text="{DynamicResource Text.PushTag.Tag}"/>
 
       <StackPanel Grid.Column="1" Orientation="Horizontal">
         <Path Width="14" Height="14" Data="{StaticResource Icons.Tag}"/>
@@ -24,9 +24,9 @@
       </StackPanel>
 
       <TextBlock Grid.Row="1" Grid.Column="0"
-					       HorizontalAlignment="Right" VerticalAlignment="Center"
-					       Margin="0,0,8,0"
-					       Text="{DynamicResource Text.PushTag.Remote}"/>
+                 HorizontalAlignment="Right" VerticalAlignment="Center"
+                 Margin="0,0,8,0"
+                 Text="{DynamicResource Text.PushTag.Remote}"/>
       <ComboBox Grid.Row="1" Grid.Column="1"
                 Height="28" Padding="8,0"
                 VerticalAlignment="Center" HorizontalAlignment="Stretch"
diff --git a/src/SourceGit/Views/Rebase.axaml b/src/SourceGit/Views/Rebase.axaml
index 6dd31ee6..2dc670d2 100644
--- a/src/SourceGit/Views/Rebase.axaml
+++ b/src/SourceGit/Views/Rebase.axaml
@@ -10,22 +10,22 @@
              x:DataType="vm:Rebase">
   <StackPanel Orientation="Vertical" Margin="8,0">
     <TextBlock FontSize="18"
-				       Classes="bold"
-				       Text="{DynamicResource Text.Rebase}"/>
+               Classes="bold"
+               Text="{DynamicResource Text.Rebase}"/>
     <Grid Margin="0,16,0,0" RowDefinitions="32,32,32" ColumnDefinitions="150,*">
       <TextBlock Grid.Row="0" Grid.Column="0"
-					       HorizontalAlignment="Right" VerticalAlignment="Center"
-					       Margin="0,0,8,0"
-					       Text="{DynamicResource Text.Reset.Target}"/>
+                 HorizontalAlignment="Right" VerticalAlignment="Center"
+                 Margin="0,0,8,0"
+                 Text="{DynamicResource Text.Reset.Target}"/>
       <StackPanel Grid.Row="0" Grid.Column="1" Orientation="Horizontal" Height="20" VerticalAlignment="Center">
         <Path Margin="0,0,8,0" Width="14" Height="14" Fill="{DynamicResource Brush.FG1}" Data="{StaticResource Icons.Branch}"/>
         <TextBlock Text="{Binding Current.Name}"/>
       </StackPanel>
 
       <TextBlock Grid.Row="1" Grid.Column="0"
-					       HorizontalAlignment="Right" VerticalAlignment="Center"
-					       Margin="0,0,8,0"
-					       Text="{DynamicResource Text.Rebase.On}"/>
+                 HorizontalAlignment="Right" VerticalAlignment="Center"
+                 Margin="0,0,8,0"
+                 Text="{DynamicResource Text.Rebase.On}"/>
       <ContentControl Grid.Row="1" Grid.Column="1" Content="{Binding On}">
         <ContentControl.DataTemplates>
           <DataTemplate DataType="m:Branch">
diff --git a/src/SourceGit/Views/RenameBranch.axaml b/src/SourceGit/Views/RenameBranch.axaml
index da2b88fa..82b89127 100644
--- a/src/SourceGit/Views/RenameBranch.axaml
+++ b/src/SourceGit/Views/RenameBranch.axaml
@@ -4,34 +4,36 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:m="using:SourceGit.Models"
              xmlns:vm="using:SourceGit.ViewModels"
+             xmlns:v="using:SourceGit.Views"
              xmlns:c="using:SourceGit.Converters"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="SourceGit.Views.RenameBranch"
              x:DataType="vm:RenameBranch">
   <StackPanel Orientation="Vertical" Margin="8,0">
     <TextBlock FontSize="18"
-				       Classes="bold"
-				       Text="{DynamicResource Text.RenameBranch}"/>
+               Classes="bold"
+               Text="{DynamicResource Text.RenameBranch}"/>
     <Grid Margin="0,16,0,0" RowDefinitions="32,32" ColumnDefinitions="150,*">
       <TextBlock Grid.Column="0"
-					       HorizontalAlignment="Right" VerticalAlignment="Center"
-					       Margin="0,0,8,0"
-					       Text="{DynamicResource Text.RenameBranch.Target}"/>
+                 HorizontalAlignment="Right" VerticalAlignment="Center"
+                 Margin="0,0,8,0"
+                 Text="{DynamicResource Text.RenameBranch.Target}"/>
       <StackPanel Grid.Column="1" Orientation="Horizontal">
         <Path Width="14" Height="14" Data="{StaticResource Icons.Branch}"/>
         <TextBlock Text="{Binding Target.Name}" Margin="8,0,0,0" />
       </StackPanel>
 
       <TextBlock Grid.Row="1" Grid.Column="0"
-					       HorizontalAlignment="Right" VerticalAlignment="Center"
-					       Margin="0,0,8,0"
-					       Text="{DynamicResource Text.RenameBranch.Name}"/>
+                 HorizontalAlignment="Right" VerticalAlignment="Center"
+                 Margin="0,0,8,0"
+                 Text="{DynamicResource Text.RenameBranch.Name}"/>
       <TextBox Grid.Row="1" Grid.Column="1"
                Height="26"
                VerticalAlignment="Center"
                CornerRadius="2"
                Text="{Binding Name, Mode=TwoWay}"
-               Watermark="{DynamicResource Text.RenameBranch.Name.Placeholder}"/>
+               Watermark="{DynamicResource Text.RenameBranch.Name.Placeholder}"
+               v:AutoFocusBehaviour.IsEnabled="True"/>
     </Grid>
   </StackPanel>
 </UserControl>
diff --git a/src/SourceGit/Views/RepositoryConfigure.axaml b/src/SourceGit/Views/RepositoryConfigure.axaml
index d819e037..8e440089 100644
--- a/src/SourceGit/Views/RepositoryConfigure.axaml
+++ b/src/SourceGit/Views/RepositoryConfigure.axaml
@@ -4,30 +4,32 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:m="using:SourceGit.Models"
              xmlns:vm="using:SourceGit.ViewModels"
+             xmlns:v="using:SourceGit.Views"
              xmlns:c="using:SourceGit.Converters"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="SourceGit.Views.RepositoryConfigure"
              x:DataType="vm:RepositoryConfigure">
   <StackPanel Orientation="Vertical" Margin="8,0">
     <TextBlock FontSize="18"
-				       Classes="bold"
-				       Text="{DynamicResource Text.Configure}"/>
+               Classes="bold"
+               Text="{DynamicResource Text.Configure}"/>
 
     <Grid Margin="0,16,0,0" RowDefinitions="32,32,32,32,32" ColumnDefinitions="150,*">
       <TextBlock Grid.Column="0"
-					       HorizontalAlignment="Right" VerticalAlignment="Center"
-					       Margin="0,0,8,0"
-					       Text="{DynamicResource Text.Configure.User}"/>
+                 HorizontalAlignment="Right" VerticalAlignment="Center"
+                 Margin="0,0,8,0"
+                 Text="{DynamicResource Text.Configure.User}"/>
       <TextBox Grid.Column="1"
                Height="28"
                CornerRadius="3"
                Watermark="{DynamicResource Text.Configure.User.Placeholder}"
-               Text="{Binding UserName, Mode=TwoWay}"/>
+               Text="{Binding UserName, Mode=TwoWay}"
+               v:AutoFocusBehaviour.IsEnabled="True"/>
 
       <TextBlock Grid.Row="1" Grid.Column="0"
-					       HorizontalAlignment="Right" VerticalAlignment="Center"
-					       Margin="0,0,8,0"
-					       Text="{DynamicResource Text.Configure.Email}"/>
+                 HorizontalAlignment="Right" VerticalAlignment="Center"
+                 Margin="0,0,8,0"
+                 Text="{DynamicResource Text.Configure.Email}"/>
       <TextBox Grid.Row="1" Grid.Column="1"
                Height="28"
                CornerRadius="3"
@@ -35,9 +37,9 @@
                Text="{Binding UserEmail, Mode=TwoWay}"/>
 
       <TextBlock Grid.Row="2" Grid.Column="0"
-					       HorizontalAlignment="Right" VerticalAlignment="Center"
-					       Margin="0,0,8,0"
-					       Text="{DynamicResource Text.Configure.Proxy}"/>
+                 HorizontalAlignment="Right" VerticalAlignment="Center"
+                 Margin="0,0,8,0"
+                 Text="{DynamicResource Text.Configure.Proxy}"/>
       <TextBox Grid.Row="2" Grid.Column="1"
                Height="28"
                CornerRadius="3"
@@ -45,17 +47,17 @@
                Text="{Binding HttpProxy, Mode=TwoWay}"/>
 
       <TextBlock Grid.Row="3" Grid.Column="0"
-					       HorizontalAlignment="Right" VerticalAlignment="Center"
-					       Margin="0,0,8,0"
-					       Text="{DynamicResource Text.Preference.GPG.Enabled}"/>
+                 HorizontalAlignment="Right" VerticalAlignment="Center"
+                 Margin="0,0,8,0"
+                 Text="{DynamicResource Text.Preference.GPG.Enabled}"/>
       <CheckBox Grid.Row="3" Grid.Column="1"
                 x:Name="chkGPGSigningEnabled"
                 IsChecked="{Binding GPGSigningEnabled, Mode=TwoWay}"/>
 
       <TextBlock Grid.Row="4" Grid.Column="0"
-					       HorizontalAlignment="Right" VerticalAlignment="Center"
-					       Margin="0,0,8,0"
-					       Text="{DynamicResource Text.Preference.GPG.UserKey}"/>
+                 HorizontalAlignment="Right" VerticalAlignment="Center"
+                 Margin="0,0,8,0"
+                 Text="{DynamicResource Text.Preference.GPG.UserKey}"/>
       <TextBox Grid.Row="4" Grid.Column="1"
                Height="28"
                CornerRadius="3"
diff --git a/src/SourceGit/Views/Reset.axaml b/src/SourceGit/Views/Reset.axaml
index 71ad3f3d..fc45b330 100644
--- a/src/SourceGit/Views/Reset.axaml
+++ b/src/SourceGit/Views/Reset.axaml
@@ -9,22 +9,22 @@
              x:DataType="vm:Reset">
   <StackPanel Orientation="Vertical" Margin="8,0">
     <TextBlock FontSize="18"
-				       Classes="bold"
-				       Text="{DynamicResource Text.Reset}"/>
+               Classes="bold"
+               Text="{DynamicResource Text.Reset}"/>
     <Grid Margin="0,16,0,0" RowDefinitions="32,32,32" ColumnDefinitions="150,*">
       <TextBlock Grid.Row="0" Grid.Column="0"
-					       HorizontalAlignment="Right" VerticalAlignment="Center"
-					       Margin="0,0,8,0"
-					       Text="{DynamicResource Text.Reset.Target}"/>
+                 HorizontalAlignment="Right" VerticalAlignment="Center"
+                 Margin="0,0,8,0"
+                 Text="{DynamicResource Text.Reset.Target}"/>
       <StackPanel Grid.Row="0" Grid.Column="1" Orientation="Horizontal" Height="20" VerticalAlignment="Center">
         <Path Margin="0,0,8,0" Width="14" Height="14" Fill="{DynamicResource Brush.FG1}" Data="{StaticResource Icons.Branch}"/>
         <TextBlock Text="{Binding Current.Name}"/>
       </StackPanel>
 
       <TextBlock Grid.Row="1" Grid.Column="0"
-					       HorizontalAlignment="Right" VerticalAlignment="Center"
-					       Margin="0,0,8,0"
-					       Text="{DynamicResource Text.Reset.MoveTo}"/>
+                 HorizontalAlignment="Right" VerticalAlignment="Center"
+                 Margin="0,0,8,0"
+                 Text="{DynamicResource Text.Reset.MoveTo}"/>
       <StackPanel Grid.Row="1" Grid.Column="1" Orientation="Horizontal" Height="20" VerticalAlignment="Center">
         <Path Margin="0,6,8,0" Width="14" Height="14" Fill="{DynamicResource Brush.FG1}" Data="{StaticResource Icons.Commit}"/>
         <TextBlock Text="{Binding To.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange"/>
@@ -32,9 +32,9 @@
       </StackPanel>
 
       <TextBlock Grid.Row="2" Grid.Column="0"
-					       HorizontalAlignment="Right" VerticalAlignment="Center"
-					       Margin="0,0,8,0"
-					       Text="{DynamicResource Text.Reset.Mode}"/>
+                 HorizontalAlignment="Right" VerticalAlignment="Center"
+                 Margin="0,0,8,0"
+                 Text="{DynamicResource Text.Reset.Mode}"/>
       <ComboBox Grid.Row="2" Grid.Column="1"
                 Height="28" Padding="8,0"
                 VerticalAlignment="Center" HorizontalAlignment="Stretch"
diff --git a/src/SourceGit/Views/Revert.axaml b/src/SourceGit/Views/Revert.axaml
index 731590d2..234e5ef4 100644
--- a/src/SourceGit/Views/Revert.axaml
+++ b/src/SourceGit/Views/Revert.axaml
@@ -10,13 +10,13 @@
              x:DataType="vm:Revert">
   <StackPanel Orientation="Vertical" Margin="8,0">
     <TextBlock FontSize="18"
-				       Classes="bold"
-				       Text="{DynamicResource Text.Revert}"/>
+               Classes="bold"
+               Text="{DynamicResource Text.Revert}"/>
     <Grid Margin="0,16,0,0" RowDefinitions="32,32" ColumnDefinitions="150,*">
       <TextBlock Grid.Column="0"
-					       HorizontalAlignment="Right" VerticalAlignment="Center"
-					       Margin="0,0,8,0"
-					       Text="{DynamicResource Text.Revert.Commit}"/>
+                 HorizontalAlignment="Right" VerticalAlignment="Center"
+                 Margin="0,0,8,0"
+                 Text="{DynamicResource Text.Revert.Commit}"/>
 
       <StackPanel Grid.Column="1" Orientation="Horizontal">
         <Path Width="14" Height="14" Margin="0,8,0,0" Data="{StaticResource Icons.Commit}"/>
diff --git a/src/SourceGit/Views/Reword.axaml b/src/SourceGit/Views/Reword.axaml
index 2b0ee5f2..3e731c92 100644
--- a/src/SourceGit/Views/Reword.axaml
+++ b/src/SourceGit/Views/Reword.axaml
@@ -3,19 +3,20 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:vm="using:SourceGit.ViewModels"
+             xmlns:v="using:SourceGit.Views"
              xmlns:c="using:SourceGit.Converters"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="SourceGit.Views.Reword"
              x:DataType="vm:Reword">
   <StackPanel Orientation="Vertical" Margin="8,0">
     <TextBlock FontSize="18"
-				       Classes="bold"
-				       Text="{DynamicResource Text.Reword}"/>
+               Classes="bold"
+               Text="{DynamicResource Text.Reword}"/>
     <Grid Margin="0,16,0,0" RowDefinitions="32,32,32" ColumnDefinitions="100,*">
       <TextBlock Grid.Row="0" Grid.Column="0"
-					       HorizontalAlignment="Right" VerticalAlignment="Center"
-					       Margin="0,0,8,0"
-					       Text="{DynamicResource Text.Reword.On}"/>
+                 HorizontalAlignment="Right" VerticalAlignment="Center"
+                 Margin="0,0,8,0"
+                 Text="{DynamicResource Text.Reword.On}"/>
       <StackPanel Grid.Row="0" Grid.Column="1" Orientation="Horizontal" Height="20" VerticalAlignment="Center">
         <Path Margin="0,6,8,0" Width="14" Height="14" Fill="{DynamicResource Brush.FG1}" Data="{StaticResource Icons.Commit}"/>
         <TextBlock Text="{Binding Head.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange"/>
@@ -23,14 +24,15 @@
       </StackPanel>
 
       <TextBlock Grid.Row="1" Grid.Column="0"
-					       HorizontalAlignment="Right" VerticalAlignment="Center"
-					       Margin="0,0,8,0"
-					       Text="{DynamicResource Text.Reword.Message}"/>
+                 HorizontalAlignment="Right" VerticalAlignment="Center"
+                 Margin="0,0,8,0"
+                 Text="{DynamicResource Text.Reword.Message}"/>
       <TextBox Grid.Row="1" Grid.RowSpan="2" Grid.Column="1"
                CornerRadius="2"
                AcceptsReturn="True"
                VerticalContentAlignment="Top"
-               Text="{Binding Message, Mode=TwoWay}"/>  
+               Text="{Binding Message, Mode=TwoWay}"
+               v:AutoFocusBehaviour.IsEnabled="True"/>  
     </Grid>
   </StackPanel>
 </UserControl>
diff --git a/src/SourceGit/Views/Squash.axaml b/src/SourceGit/Views/Squash.axaml
index cdd9646a..638bbcc3 100644
--- a/src/SourceGit/Views/Squash.axaml
+++ b/src/SourceGit/Views/Squash.axaml
@@ -3,19 +3,20 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:vm="using:SourceGit.ViewModels"
+             xmlns:v="using:SourceGit.Views"
              xmlns:c="using:SourceGit.Converters"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="SourceGit.Views.Squash"
              x:DataType="vm:Squash">
   <StackPanel Orientation="Vertical" Margin="8,0">
     <TextBlock FontSize="18"
-				       Classes="bold"
-				       Text="{DynamicResource Text.Squash}"/>
+               Classes="bold"
+               Text="{DynamicResource Text.Squash}"/>
     <Grid Margin="0,16,0,0" RowDefinitions="32,32,32,32" ColumnDefinitions="100,*">
       <TextBlock Grid.Row="0" Grid.Column="0"
-					       HorizontalAlignment="Right" VerticalAlignment="Center"
-					       Margin="0,0,8,0"
-					       Text="{DynamicResource Text.Squash.Head}"/>
+                 HorizontalAlignment="Right" VerticalAlignment="Center"
+                 Margin="0,0,8,0"
+                 Text="{DynamicResource Text.Squash.Head}"/>
       <StackPanel Grid.Row="0" Grid.Column="1" Orientation="Horizontal" Height="20" VerticalAlignment="Center">
         <Path Margin="0,6,8,0" Width="14" Height="14" Fill="{DynamicResource Brush.FG1}" Data="{StaticResource Icons.Commit}"/>
         <TextBlock Text="{Binding Head.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange"/>
@@ -23,9 +24,9 @@
       </StackPanel>
 
       <TextBlock Grid.Row="1" Grid.Column="0"
-					       HorizontalAlignment="Right" VerticalAlignment="Center"
-					       Margin="0,0,8,0"
-					       Text="{DynamicResource Text.Squash.To}"/>
+                 HorizontalAlignment="Right" VerticalAlignment="Center"
+                 Margin="0,0,8,0"
+                 Text="{DynamicResource Text.Squash.To}"/>
       <StackPanel Grid.Row="1" Grid.Column="1" Orientation="Horizontal" Height="20" VerticalAlignment="Center">
         <Path Margin="0,6,8,0" Width="14" Height="14" Fill="{DynamicResource Brush.FG1}" Data="{StaticResource Icons.Commit}"/>
         <TextBlock Text="{Binding Parent.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange"/>
@@ -33,14 +34,15 @@
       </StackPanel>
 
       <TextBlock Grid.Row="2" Grid.Column="0"
-					       HorizontalAlignment="Right" VerticalAlignment="Center"
-					       Margin="0,0,8,0"
-					       Text="{DynamicResource Text.Squash.Message}"/>
+                 HorizontalAlignment="Right" VerticalAlignment="Center"
+                 Margin="0,0,8,0"
+                 Text="{DynamicResource Text.Squash.Message}"/>
       <TextBox Grid.Row="2" Grid.RowSpan="2" Grid.Column="1"
                CornerRadius="2"
                AcceptsReturn="True"
                VerticalContentAlignment="Top"
-               Text="{Binding Message, Mode=TwoWay}"/>
+               Text="{Binding Message, Mode=TwoWay}"
+               v:AutoFocusBehaviour.IsEnabled="True"/>
     </Grid>
   </StackPanel>
 </UserControl>
diff --git a/src/SourceGit/Views/StashChanges.axaml b/src/SourceGit/Views/StashChanges.axaml
index 38730dac..f87ed373 100644
--- a/src/SourceGit/Views/StashChanges.axaml
+++ b/src/SourceGit/Views/StashChanges.axaml
@@ -11,11 +11,16 @@
              x:DataType="vm:StashChanges">
   <StackPanel Orientation="Vertical" Margin="8,0,0,0">
     <TextBlock FontSize="18"
-				       Classes="bold"
-				       Text="{DynamicResource Text.Stash.Title}"/>
+               Classes="bold"
+               Text="{DynamicResource Text.Stash.Title}"/>
     <Grid Margin="8,16,0,0" RowDefinitions="32,Auto" ColumnDefinitions="Auto,*">
       <TextBlock Grid.Column="0" HorizontalAlignment="Right" Margin="8,0" Text="{DynamicResource Text.Stash.Message}"/>
-      <TextBox Grid.Column="1" Height="26" CornerRadius="3" Text="{Binding Message, Mode=TwoWay}" Watermark="{DynamicResource Text.Stash.Message.Placeholder}"/>
+      <TextBox Grid.Column="1" 
+               Height="26" 
+               CornerRadius="3" 
+               Text="{Binding Message, Mode=TwoWay}"
+               Watermark="{DynamicResource Text.Stash.Message.Placeholder}"
+               v:AutoFocusBehaviour.IsEnabled="True"/>
 
       <CheckBox Grid.Row="1" Grid.Column="1"
                 Height="32"
diff --git a/src/SourceGit/Views/StashesPage.axaml b/src/SourceGit/Views/StashesPage.axaml
index 29b34b13..c2877f5e 100644
--- a/src/SourceGit/Views/StashesPage.axaml
+++ b/src/SourceGit/Views/StashesPage.axaml
@@ -38,18 +38,18 @@
       <!-- Stash List -->
       <DataGrid Grid.Row="1"
                 Background="{DynamicResource Brush.Contents}"
-								ItemsSource="{Binding Stashes}"
+                ItemsSource="{Binding Stashes}"
                 SelectedItem="{Binding SelectedStash, Mode=TwoWay}"
-								SelectionMode="Single"
-								CanUserReorderColumns="False"
-								CanUserResizeColumns="False"
-								CanUserSortColumns="False"
-								IsReadOnly="True"
-								HeadersVisibility="None"
-								Focusable="False"
-								RowHeight="50"
-								HorizontalScrollBarVisibility="Disabled"
-								VerticalScrollBarVisibility="Auto">
+                SelectionMode="Single"
+                CanUserReorderColumns="False"
+                CanUserResizeColumns="False"
+                CanUserSortColumns="False"
+                IsReadOnly="True"
+                HeadersVisibility="None"
+                Focusable="False"
+                RowHeight="50"
+                HorizontalScrollBarVisibility="Disabled"
+                VerticalScrollBarVisibility="Auto">
         <DataGrid.Columns>
           <DataGridTemplateColumn Width="*">
             <DataGridTemplateColumn.CellTemplate>