From 35a79755f5a123b604b86cb57e1ccb22494f6b5e Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 9 Mar 2026 16:28:19 +0800
Subject: [PATCH] enhance: auto-focus the first input element in popup (#2172)

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Resources/Styles.axaml             | 46 +++++++++++++++++++++++++-
 src/Views/AddRemote.axaml              |  3 +-
 src/Views/AddSubmodule.axaml           |  4 +--
 src/Views/AddToIgnore.axaml            |  4 +--
 src/Views/Apply.axaml                  |  4 +--
 src/Views/Archive.axaml                |  4 +--
 src/Views/Clone.axaml                  |  4 +--
 src/Views/CommitChanges.axaml          |  3 +-
 src/Views/Compare.axaml                |  3 +-
 src/Views/CreateBranch.axaml           |  3 +-
 src/Views/CreateGroup.axaml            |  3 +-
 src/Views/CreateTag.axaml              |  3 +-
 src/Views/DirHistories.axaml           |  3 +-
 src/Views/EditRemote.axaml             |  4 +--
 src/Views/EditRepositoryNode.axaml     |  3 +-
 src/Views/ExecuteCustomAction.axaml    |  3 +-
 src/Views/ExecuteCustomAction.axaml.cs | 15 ---------
 src/Views/FileHistories.axaml          |  3 +-
 src/Views/GitFlowStart.axaml           |  4 +--
 src/Views/Histories.axaml              |  3 +-
 src/Views/InitGitFlow.axaml            |  4 +--
 src/Views/InteractiveRebase.axaml      |  3 +-
 src/Views/LFSTrackCustomPattern.axaml  |  4 +--
 src/Views/LauncherPage.axaml           |  3 +-
 src/Views/PopupDataTemplates.cs        | 36 ++++++++++++++++++--
 src/Views/RenameBranch.axaml           |  3 +-
 src/Views/Repository.axaml             |  3 +-
 src/Views/RevisionCompare.axaml        |  3 +-
 src/Views/RevisionFiles.axaml          |  3 +-
 src/Views/StashChanges.axaml           |  1 -
 src/Views/StashesPage.axaml            |  3 +-
 src/Views/ViewLogs.axaml               |  3 +-
 src/Views/WorkingCopy.axaml            |  9 +++--
 33 files changed, 125 insertions(+), 75 deletions(-)

diff --git a/src/Resources/Styles.axaml b/src/Resources/Styles.axaml
index 4ca2e74f..c6199b43 100644
--- a/src/Resources/Styles.axaml
+++ b/src/Resources/Styles.axaml
@@ -182,6 +182,14 @@
     <Setter Property="FontSize" Value="{Binding Source={x:Static vm:Preferences.Instance}, Path=DefaultFontSize}"/>
   </Style>
 
+  <Style Selector="AdornerLayer">
+    <Setter Property="DefaultFocusAdorner">
+      <FocusAdornerTemplate>
+        <Rectangle Margin="0" Stroke="{DynamicResource Brush.FG1}" StrokeDashArray="1,2" StrokeThickness="1"/>
+      </FocusAdornerTemplate>
+    </Setter>
+  </Style>
+
   <Style Selector="ToolTip">
     <Setter Property="Foreground" Value="{DynamicResource Brush.FG1}"/>
     <Setter Property="Background" Value="{DynamicResource Brush.Popup}"/>
@@ -1067,6 +1075,12 @@
   </Style>
 
   <Style Selector="CheckBox">
+    <Setter Property="FocusAdorner">
+      <FocusAdornerTemplate>
+        <Border/>
+      </FocusAdornerTemplate>
+    </Setter>
+    
     <Setter Property="VerticalAlignment" Value="Center"/>
     <Setter Property="Template">
       <ControlTemplate>
@@ -1085,7 +1099,14 @@
         </Grid>
       </ControlTemplate>
     </Setter>
-
+    
+    <Style Selector="^:focus-visible /template/ Border#Border">
+      <Setter Property="BorderBrush" Value="{DynamicResource Brush.Accent}"/>
+      <Setter Property="Background" Value="{DynamicResource Brush.Accent}"/>
+    </Style>
+    <Style Selector="^:focus-visible /template/ Path#Icon">
+      <Setter Property="Fill" Value="White"/>
+    </Style>
     <Style Selector="^:pointerover /template/ Border#Border">
       <Setter Property="BorderBrush" Value="{DynamicResource Brush.Accent}"/>
     </Style>
@@ -1095,6 +1116,12 @@
   </Style>
 
   <Style Selector="RadioButton">
+    <Setter Property="FocusAdorner">
+      <FocusAdornerTemplate>
+        <Border/>
+      </FocusAdornerTemplate>
+    </Setter>
+    
     <Setter Property="Template">
       <ControlTemplate>
         <Grid ColumnDefinitions="16,*" Background="Transparent">
@@ -1136,9 +1163,26 @@
     <Style Selector="^:checked /template/ Ellipse#Dot">
       <Setter Property="Fill" Value="{DynamicResource Brush.Accent}"/>
     </Style>
+    <Style Selector="^:focus-visible /template/ Ellipse#Border">
+      <Setter Property="Stroke" Value="{DynamicResource Brush.Accent}"/>
+      <Setter Property="Fill" Value="{DynamicResource Brush.Accent}"/>
+    </Style>
+    <Style Selector="^:focus-visible /template/ Ellipse#Dot">
+      <Setter Property="Stroke" Value="White"/>
+      <Setter Property="Fill" Value="White"/>
+    </Style>
+    <Style Selector="^:focus-visible:checked /template/ Ellipse#Dot">
+      <Setter Property="Fill" Value="{DynamicResource Brush.Accent}"/>
+    </Style>
   </Style>
 
   <Style Selector="RadioButton.switch_button">
+    <Setter Property="FocusAdorner">
+      <FocusAdornerTemplate>
+        <Rectangle Margin="0" Stroke="{DynamicResource Brush.FG1}" StrokeDashArray="1,2" StrokeThickness="1"/>
+      </FocusAdornerTemplate>
+    </Setter>
+
     <Setter Property="Height" Value="24"/>
     <Setter Property="BorderThickness" Value="0"/>
     <Setter Property="Background" Value="Transparent"/>
diff --git a/src/Views/AddRemote.axaml b/src/Views/AddRemote.axaml
index b9c66f48..eb8d8b9f 100644
--- a/src/Views/AddRemote.axaml
+++ b/src/Views/AddRemote.axaml
@@ -29,8 +29,7 @@
                VerticalAlignment="Center"
                CornerRadius="2"
                Watermark="{DynamicResource Text.Remote.Name.Placeholder}"
-               Text="{Binding Name, Mode=TwoWay}"
-               v:AutoFocusBehaviour.IsEnabled="True"/>
+               Text="{Binding Name, Mode=TwoWay}"/>
 
       <TextBlock Grid.Row="1" Grid.Column="0"
                  HorizontalAlignment="Right" VerticalAlignment="Center"
diff --git a/src/Views/AddSubmodule.axaml b/src/Views/AddSubmodule.axaml
index 716c9f30..fed513bf 100644
--- a/src/Views/AddSubmodule.axaml
+++ b/src/Views/AddSubmodule.axaml
@@ -3,7 +3,6 @@
              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="500" d:DesignHeight="450"
              x:Class="SourceGit.Views.AddSubmodule"
              x:DataType="vm:AddSubmodule">
@@ -28,8 +27,7 @@
                VerticalAlignment="Center"
                CornerRadius="2"
                Watermark="{DynamicResource Text.RepositoryURL}"
-               Text="{Binding Url, Mode=TwoWay}"
-               v:AutoFocusBehaviour.IsEnabled="True"/>
+               Text="{Binding Url, Mode=TwoWay}"/>
 
       <TextBlock Grid.Row="1" Grid.Column="0"
                  HorizontalAlignment="Right" VerticalAlignment="Center"
diff --git a/src/Views/AddToIgnore.axaml b/src/Views/AddToIgnore.axaml
index 991fab87..a977a45d 100644
--- a/src/Views/AddToIgnore.axaml
+++ b/src/Views/AddToIgnore.axaml
@@ -4,7 +4,6 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:m="using:SourceGit.Models"
              xmlns:vm="using:SourceGit.ViewModels"
-             xmlns:v="using:SourceGit.Views"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="SourceGit.Views.AddToIgnore"
              x:DataType="vm:AddToIgnore">
@@ -27,8 +26,7 @@
       <TextBox Grid.Row="0" Grid.Column="1"
                Height="28"
                CornerRadius="3"
-               Text="{Binding Pattern, Mode=TwoWay}"
-               v:AutoFocusBehaviour.IsEnabled="True">
+               Text="{Binding Pattern, Mode=TwoWay}">
         <TextBox.InnerLeftContent>
           <Path Width="12" Height="12" Margin="6,0,2,0" Data="{StaticResource Icons.Pattern}" Fill="{DynamicResource Brush.FG2}"/>
         </TextBox.InnerLeftContent>
diff --git a/src/Views/Apply.axaml b/src/Views/Apply.axaml
index 1b683e9b..d1265a5a 100644
--- a/src/Views/Apply.axaml
+++ b/src/Views/Apply.axaml
@@ -4,7 +4,6 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:m="using:SourceGit.Models"
              xmlns:vm="using:SourceGit.ViewModels"
-             xmlns:v="using:SourceGit.Views"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="SourceGit.Views.Apply"
              x:DataType="vm:Apply">
@@ -29,8 +28,7 @@
                Height="28"
                CornerRadius="3"
                Watermark="{DynamicResource Text.Apply.File.Placeholder}"
-               Text="{Binding PatchFile, Mode=TwoWay}"
-               v:AutoFocusBehaviour.IsEnabled="True">
+               Text="{Binding PatchFile, Mode=TwoWay}">
         <TextBox.InnerRightContent>
           <Button Classes="icon_button" Width="30" Height="30" Click="SelectPatchFile">
             <Path Data="{StaticResource Icons.Folder.Open}" Fill="{DynamicResource Brush.FG1}"/>
diff --git a/src/Views/Archive.axaml b/src/Views/Archive.axaml
index 2cbdfba5..5751a0e7 100644
--- a/src/Views/Archive.axaml
+++ b/src/Views/Archive.axaml
@@ -4,7 +4,6 @@
              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"
@@ -60,8 +59,7 @@
                Height="28"
                CornerRadius="3"
                Watermark="{DynamicResource Text.Archive.File.Placeholder}"
-               Text="{Binding SaveFile, Mode=TwoWay}"
-               v:AutoFocusBehaviour.IsEnabled="True">
+               Text="{Binding SaveFile, Mode=TwoWay}">
         <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/Views/Clone.axaml b/src/Views/Clone.axaml
index 7d50fdb7..ce5bbeaf 100644
--- a/src/Views/Clone.axaml
+++ b/src/Views/Clone.axaml
@@ -3,7 +3,6 @@
              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.Clone"
              x:DataType="vm:Clone">
@@ -27,8 +26,7 @@
       <TextBox Grid.Row="0" Grid.Column="1"
                Height="28"
                CornerRadius="3"
-               Text="{Binding Remote, Mode=TwoWay}"
-               v:AutoFocusBehaviour.IsEnabled="True"/>
+               Text="{Binding Remote, Mode=TwoWay}"/>
 
       <TextBlock Grid.Row="1" Grid.Column="0"
                  HorizontalAlignment="Right"
diff --git a/src/Views/CommitChanges.axaml b/src/Views/CommitChanges.axaml
index 7c4e23d0..d7d245cc 100644
--- a/src/Views/CommitChanges.axaml
+++ b/src/Views/CommitChanges.axaml
@@ -68,7 +68,8 @@
     <GridSplitter Grid.Column="1"
                   MinWidth="1"
                   HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
-                  Background="Transparent"/>
+                  Background="Transparent"
+                  Focusable="False"/>
 
     <Grid Grid.Column="2">
       <Border BorderThickness="1" BorderBrush="{DynamicResource Brush.Border2}">
diff --git a/src/Views/Compare.axaml b/src/Views/Compare.axaml
index fa96f03b..a311eb38 100644
--- a/src/Views/Compare.axaml
+++ b/src/Views/Compare.axaml
@@ -159,7 +159,8 @@
         <GridSplitter Grid.Column="1"
                       MinWidth="1"
                       HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
-                      Background="Transparent"/>
+                      Background="Transparent"
+                      Focusable="False"/>
 
         <Grid Grid.Column="2">
           <Border BorderThickness="1" BorderBrush="{DynamicResource Brush.Border2}">
diff --git a/src/Views/CreateBranch.axaml b/src/Views/CreateBranch.axaml
index 75db53f5..c494adbf 100644
--- a/src/Views/CreateBranch.axaml
+++ b/src/Views/CreateBranch.axaml
@@ -65,8 +65,7 @@
                                 VerticalAlignment="Center"
                                 CornerRadius="2"
                                 Text="{Binding Name, Mode=TwoWay}"
-                                Watermark="{DynamicResource Text.CreateBranch.Name.Placeholder}"
-                                v:AutoFocusBehaviour.IsEnabled="True"/>
+                                Watermark="{DynamicResource Text.CreateBranch.Name.Placeholder}"/>
 
       <TextBlock Grid.Row="2" Grid.Column="0"
                  HorizontalAlignment="Right" VerticalAlignment="Center"
diff --git a/src/Views/CreateGroup.axaml b/src/Views/CreateGroup.axaml
index 15b57020..b939224e 100644
--- a/src/Views/CreateGroup.axaml
+++ b/src/Views/CreateGroup.axaml
@@ -3,7 +3,6 @@
              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">
@@ -20,7 +19,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" v:AutoFocusBehaviour.IsEnabled="True" Text="{Binding Name, Mode=TwoWay}"/>
+      <TextBox Grid.Column="1" CornerRadius="3" Text="{Binding Name, Mode=TwoWay}"/>
     </Grid>
   </StackPanel>
 </UserControl>
diff --git a/src/Views/CreateTag.axaml b/src/Views/CreateTag.axaml
index ca84bbbe..de53971e 100644
--- a/src/Views/CreateTag.axaml
+++ b/src/Views/CreateTag.axaml
@@ -53,8 +53,7 @@
                                 VerticalAlignment="Center"
                                 CornerRadius="2"
                                 Text="{Binding TagName, Mode=TwoWay}"
-                                Watermark="{DynamicResource Text.CreateTag.Name.Placeholder}"
-                                v:AutoFocusBehaviour.IsEnabled="True"/>
+                                Watermark="{DynamicResource Text.CreateTag.Name.Placeholder}"/>
 
       <TextBlock Grid.Row="2" Grid.Column="0"
                  HorizontalAlignment="Right" VerticalAlignment="Center"
diff --git a/src/Views/DirHistories.axaml b/src/Views/DirHistories.axaml
index e2c0beff..e8c1f6cb 100644
--- a/src/Views/DirHistories.axaml
+++ b/src/Views/DirHistories.axaml
@@ -117,7 +117,8 @@
                     HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
                     Background="Transparent"
                     BorderThickness="1,0,0,0"
-                    BorderBrush="{DynamicResource Brush.Border0}"/>
+                    BorderBrush="{DynamicResource Brush.Border0}"
+                    Focusable="False"/>
 
       <!-- Commit Detail -->
       <Border Grid.Column="2" Padding="0,4" IsVisible="{Binding !IsLoading}">
diff --git a/src/Views/EditRemote.axaml b/src/Views/EditRemote.axaml
index 251bdc7a..85f9175e 100644
--- a/src/Views/EditRemote.axaml
+++ b/src/Views/EditRemote.axaml
@@ -3,7 +3,6 @@
              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="500" d:DesignHeight="450"
              x:Class="SourceGit.Views.EditRemote"
              x:DataType="vm:EditRemote">
@@ -28,8 +27,7 @@
                VerticalAlignment="Center"
                CornerRadius="2"
                Watermark="{DynamicResource Text.Remote.Name.Placeholder}"
-               Text="{Binding Name, Mode=TwoWay}"
-               v:AutoFocusBehaviour.IsEnabled="True"/>
+               Text="{Binding Name, Mode=TwoWay}"/>
 
       <TextBlock Grid.Row="1" Grid.Column="0"
                  HorizontalAlignment="Right" VerticalAlignment="Center"
diff --git a/src/Views/EditRepositoryNode.axaml b/src/Views/EditRepositoryNode.axaml
index a7974824..0ec9e7c5 100644
--- a/src/Views/EditRepositoryNode.axaml
+++ b/src/Views/EditRepositoryNode.axaml
@@ -4,7 +4,6 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:c="using:SourceGit.Converters"
              xmlns:vm="using:SourceGit.ViewModels"
-             xmlns:v="using:SourceGit.Views"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="SourceGit.Views.EditRepositoryNode"
              x:DataType="vm:EditRepositoryNode">
@@ -32,7 +31,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}" v:AutoFocusBehaviour.IsEnabled="True"/>
+      <TextBox Grid.Column="1" CornerRadius="3" Text="{Binding Name, Mode=TwoWay}"/>
     </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/Views/ExecuteCustomAction.axaml b/src/Views/ExecuteCustomAction.axaml
index b0525c12..4bc90db5 100644
--- a/src/Views/ExecuteCustomAction.axaml
+++ b/src/Views/ExecuteCustomAction.axaml
@@ -7,8 +7,7 @@
              xmlns:c="using:SourceGit.Converters"
              mc:Ignorable="d" d:DesignWidth="500" d:DesignHeight="450"
              x:Class="SourceGit.Views.ExecuteCustomAction"
-             x:DataType="vm:ExecuteCustomAction"
-             Loaded="OnLoaded">
+             x:DataType="vm:ExecuteCustomAction">
   <StackPanel Orientation="Vertical" Margin="8,0">
     <StackPanel Orientation="Horizontal">
       <Path Width="16" Height="16"
diff --git a/src/Views/ExecuteCustomAction.axaml.cs b/src/Views/ExecuteCustomAction.axaml.cs
index fa7e9713..ad9ff984 100644
--- a/src/Views/ExecuteCustomAction.axaml.cs
+++ b/src/Views/ExecuteCustomAction.axaml.cs
@@ -1,10 +1,8 @@
 using System;
 
 using Avalonia.Controls;
-using Avalonia.Input;
 using Avalonia.Interactivity;
 using Avalonia.Platform.Storage;
-using Avalonia.VisualTree;
 
 namespace SourceGit.Views
 {
@@ -15,19 +13,6 @@ namespace SourceGit.Views
             InitializeComponent();
         }
 
-        private void OnLoaded(object sender, RoutedEventArgs e)
-        {
-            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)
         {
             var topLevel = TopLevel.GetTopLevel(this);
diff --git a/src/Views/FileHistories.axaml b/src/Views/FileHistories.axaml
index 05530f1e..11d28996 100644
--- a/src/Views/FileHistories.axaml
+++ b/src/Views/FileHistories.axaml
@@ -110,7 +110,8 @@
                     HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
                     Background="Transparent"
                     BorderThickness="1,0,0,0"
-                    BorderBrush="{DynamicResource Brush.Border0}"/>
+                    BorderBrush="{DynamicResource Brush.Border0}"
+                    Focusable="False"/>
 
       <ContentControl Grid.Column="2" Content="{Binding ViewContent}">
         <ContentControl.DataTemplates>
diff --git a/src/Views/GitFlowStart.axaml b/src/Views/GitFlowStart.axaml
index 8c9455ed..9c287f09 100644
--- a/src/Views/GitFlowStart.axaml
+++ b/src/Views/GitFlowStart.axaml
@@ -4,7 +4,6 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:m="using:SourceGit.Models"
              xmlns:vm="using:SourceGit.ViewModels"
-             xmlns:v="using:SourceGit.Views"
              mc:Ignorable="d" d:DesignWidth="500" d:DesignHeight="450"
              x:Class="SourceGit.Views.GitFlowStart"
              x:DataType="vm:GitFlowStart">
@@ -38,8 +37,7 @@
                VerticalAlignment="Center"
                CornerRadius="2"
                Watermark="{DynamicResource Text.GitFlow.StartPlaceholder}"
-               Text="{Binding Name, Mode=TwoWay}"
-               v:AutoFocusBehaviour.IsEnabled="True"/>
+               Text="{Binding Name, Mode=TwoWay}"/>
     </Grid>
   </StackPanel>
 </UserControl>
diff --git a/src/Views/Histories.axaml b/src/Views/Histories.axaml
index 1a10f11d..a01adc71 100644
--- a/src/Views/Histories.axaml
+++ b/src/Views/Histories.axaml
@@ -277,7 +277,8 @@
                   MinWidth="1" MinHeight="1"
                   HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
                   Background="{DynamicResource Brush.Window}"
-                  BorderBrush="{DynamicResource Brush.Border0}"/>
+                  BorderBrush="{DynamicResource Brush.Border0}"
+                  Focusable="False"/>
 
     <Grid Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="3">
       <Grid IsVisible="{Binding DetailContext, Converter={x:Static ObjectConverters.IsNull}}">
diff --git a/src/Views/InitGitFlow.axaml b/src/Views/InitGitFlow.axaml
index a767be59..83415803 100644
--- a/src/Views/InitGitFlow.axaml
+++ b/src/Views/InitGitFlow.axaml
@@ -3,7 +3,6 @@
              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="500" d:DesignHeight="450"
              x:Class="SourceGit.Views.InitGitFlow"
              x:DataType="vm:InitGitFlow">
@@ -27,8 +26,7 @@
                Height="26"
                VerticalAlignment="Center"
                CornerRadius="2"
-               Text="{Binding Master, Mode=TwoWay}"
-               v:AutoFocusBehaviour.IsEnabled="True"/>
+               Text="{Binding Master, Mode=TwoWay}"/>
 
       <TextBlock Grid.Row="1" Grid.Column="0"
                  HorizontalAlignment="Right" VerticalAlignment="Center"
diff --git a/src/Views/InteractiveRebase.axaml b/src/Views/InteractiveRebase.axaml
index 04d6fdab..66529377 100644
--- a/src/Views/InteractiveRebase.axaml
+++ b/src/Views/InteractiveRebase.axaml
@@ -207,7 +207,8 @@
                       HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
                       Background="Transparent"
                       BorderThickness="0,1,0,0"
-                      BorderBrush="{DynamicResource Brush.Border2}"/>
+                      BorderBrush="{DynamicResource Brush.Border2}"
+                      Focusable="False"/>
 
         <ContentControl Grid.Row="2">
           <ContentControl.Content>
diff --git a/src/Views/LFSTrackCustomPattern.axaml b/src/Views/LFSTrackCustomPattern.axaml
index eca40275..5103917b 100644
--- a/src/Views/LFSTrackCustomPattern.axaml
+++ b/src/Views/LFSTrackCustomPattern.axaml
@@ -3,7 +3,6 @@
              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.LFSTrackCustomPattern"
              x:DataType="vm:LFSTrackCustomPattern">
@@ -26,8 +25,7 @@
       <TextBox Grid.Row="0" Grid.Column="1"
                Height="28"
                CornerRadius="3"
-               Text="{Binding Pattern, Mode=TwoWay}"
-               v:AutoFocusBehaviour.IsEnabled="True"/>
+               Text="{Binding Pattern, Mode=TwoWay}"/>
 
       <CheckBox Grid.Row="1" Grid.Column="1"
                 Content="{DynamicResource Text.GitLFS.AddTrackPattern.IsFilename}"
diff --git a/src/Views/LauncherPage.axaml b/src/Views/LauncherPage.axaml
index 20f4e8ca..78da1097 100644
--- a/src/Views/LauncherPage.axaml
+++ b/src/Views/LauncherPage.axaml
@@ -86,7 +86,8 @@
                               IsVisible="{Binding InProgress, Converter={x:Static BoolConverters.Not}}">
                     <Button Width="0" Height="0"
                             Click="OnPopupSureByHotKey"
-                            HotKey="Enter"/>
+                            HotKey="Enter"
+                            Focusable="False"/>
                     <Button Classes="flat primary"
                             Width="100" Height="28"
                             Padding="0"
diff --git a/src/Views/PopupDataTemplates.cs b/src/Views/PopupDataTemplates.cs
index e9462bcc..4720a234 100644
--- a/src/Views/PopupDataTemplates.cs
+++ b/src/Views/PopupDataTemplates.cs
@@ -1,11 +1,43 @@
 using Avalonia.Controls;
 using Avalonia.Controls.Templates;
+using Avalonia.Input;
+using Avalonia.VisualTree;
 
 namespace SourceGit.Views
 {
     public class PopupDataTemplates : IDataTemplate
     {
-        public Control Build(object param) => App.CreateViewForViewModel(param);
-        public bool Match(object data) => data is ViewModels.Popup;
+        public bool Match(object data)
+        {
+            return data is ViewModels.Popup;
+        }
+
+        public Control Build(object param)
+        {
+            var control = App.CreateViewForViewModel(param);
+
+            control.Loaded += (o, e) =>
+            {
+                if (o is not Control ctl)
+                    return;
+
+                var inputs = ctl.GetVisualDescendants();
+                foreach (var input in inputs)
+                {
+                    if (input is SelectableTextBlock)
+                        continue;
+
+                    if (input is InputElement { Focusable: true, IsEffectivelyEnabled: true } focusable)
+                    {
+                        focusable.Focus(NavigationMethod.Directional);
+                        if (input is TextBox box)
+                            box.CaretIndex = box.CaretIndex = box.Text?.Length ?? 0;
+                        return;
+                    }
+                }
+            };
+
+            return control;
+        }
     }
 }
diff --git a/src/Views/RenameBranch.axaml b/src/Views/RenameBranch.axaml
index 91c3891d..d193a5fd 100644
--- a/src/Views/RenameBranch.axaml
+++ b/src/Views/RenameBranch.axaml
@@ -37,8 +37,7 @@
                                 VerticalAlignment="Center"
                                 CornerRadius="2"
                                 Text="{Binding Name, Mode=TwoWay}"
-                                Watermark="{DynamicResource Text.RenameBranch.Name.Placeholder}"
-                                v:AutoFocusBehaviour.IsEnabled="True"/>
+                                Watermark="{DynamicResource Text.RenameBranch.Name.Placeholder}"/>
     </Grid>
   </StackPanel>
 </UserControl>
diff --git a/src/Views/Repository.axaml b/src/Views/Repository.axaml
index 8c54664d..b4c5496c 100644
--- a/src/Views/Repository.axaml
+++ b/src/Views/Repository.axaml
@@ -693,7 +693,8 @@
                   HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
                   Background="Transparent"
                   BorderThickness="0,0,1,0"
-                  BorderBrush="{DynamicResource Brush.Border0}"/>
+                  BorderBrush="{DynamicResource Brush.Border0}"
+                  Focusable="False"/>
 
     <!-- Right -->
     <Grid Grid.Column="2" RowDefinitions="Auto,Auto,Auto,*">
diff --git a/src/Views/RevisionCompare.axaml b/src/Views/RevisionCompare.axaml
index 14506189..5cb65882 100644
--- a/src/Views/RevisionCompare.axaml
+++ b/src/Views/RevisionCompare.axaml
@@ -125,7 +125,8 @@
       <GridSplitter Grid.Column="1"
                     MinWidth="1"
                     HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
-                    Background="Transparent"/>
+                    Background="Transparent"
+                    Focusable="False"/>
 
       <Grid Grid.Column="2">
         <Border BorderThickness="1" BorderBrush="{DynamicResource Brush.Border2}">
diff --git a/src/Views/RevisionFiles.axaml b/src/Views/RevisionFiles.axaml
index 5c946a19..a05eae47 100644
--- a/src/Views/RevisionFiles.axaml
+++ b/src/Views/RevisionFiles.axaml
@@ -109,7 +109,8 @@
     <GridSplitter Grid.Column="1"
                   MinWidth="1"
                   HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
-                  Background="Transparent"/>
+                  Background="Transparent"
+                  Focusable="False"/>
 
     <!-- Right: File Content Viewer -->
     <Grid Grid.Column="2">
diff --git a/src/Views/StashChanges.axaml b/src/Views/StashChanges.axaml
index 77718113..ee79af7b 100644
--- a/src/Views/StashChanges.axaml
+++ b/src/Views/StashChanges.axaml
@@ -54,7 +54,6 @@
                AcceptsTab="True"
                VerticalContentAlignment="Top"
                Padding="4"
-               v:AutoFocusBehaviour.IsEnabled="True"
                Tag="{Binding Source={x:Static v:StealHotKey.Enter}}"/>
 
       <CheckBox Grid.Row="2" Grid.Column="1"
diff --git a/src/Views/StashesPage.axaml b/src/Views/StashesPage.axaml
index f755dbf1..4da6f9d5 100644
--- a/src/Views/StashesPage.axaml
+++ b/src/Views/StashesPage.axaml
@@ -141,7 +141,8 @@
                   HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
                   Background="Transparent"
                   BorderThickness="1,0,0,0"
-                  BorderBrush="{DynamicResource Brush.Border0}"/>
+                  BorderBrush="{DynamicResource Brush.Border0}"
+                  Focusable="False"/>
 
     <!-- Right -->
     <Grid Grid.Column="2" Margin="0,4,4,4">
diff --git a/src/Views/ViewLogs.axaml b/src/Views/ViewLogs.axaml
index d386a996..b6d0d4df 100644
--- a/src/Views/ViewLogs.axaml
+++ b/src/Views/ViewLogs.axaml
@@ -118,7 +118,8 @@
                     MinWidth="1"
                     HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
                     Background="Transparent"
-                    BorderThickness="0"/>
+                    BorderThickness="0"
+                    Focusable="False"/>
 
       <Border Grid.Column="2"
               BorderBrush="{DynamicResource Brush.Border2}"
diff --git a/src/Views/WorkingCopy.axaml b/src/Views/WorkingCopy.axaml
index 5b056b11..a3bf6fdf 100644
--- a/src/Views/WorkingCopy.axaml
+++ b/src/Views/WorkingCopy.axaml
@@ -141,7 +141,8 @@
       <GridSplitter Grid.Row="2"
                     MinHeight="1"
                     HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
-                    Background="{DynamicResource Brush.Border0}"/>
+                    Background="{DynamicResource Brush.Border0}"
+                    Focusable="False"/>
 
       <!-- Staged -->
       <Grid Grid.Row="3" RowDefinitions="28,*">
@@ -197,7 +198,8 @@
                   HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
                   Background="Transparent"
                   BorderThickness="1,0,0,0"
-                  BorderBrush="{DynamicResource Brush.Border0}"/>
+                  BorderBrush="{DynamicResource Brush.Border0}"
+                  Focusable="False"/>
 
     <!-- Right -->
     <Grid Grid.Column="2" Margin="0,4,4,4">
@@ -237,7 +239,8 @@
       <!-- Splitter -->
       <GridSplitter Grid.Row="1" MinHeight="1"
                     HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
-                    Background="Transparent"/>
+                    Background="Transparent"
+                    Focusable="False"/>
 
       <!-- Commit Message -->
       <v:CommitMessageToolBox Grid.Row="2" ShowAdvancedOptions="True" CommitMessage="{Binding CommitMessage, Mode=TwoWay}"/>