diff --git a/src/Views/Askpass.axaml b/src/Views/Askpass.axaml
index e1d257ec..f2308805 100644
--- a/src/Views/Askpass.axaml
+++ b/src/Views/Askpass.axaml
@@ -39,15 +39,15 @@
         <TextBlock Text="{Binding Description}" TextWrapping="Wrap"/>
       </Border>
       
-      <TextBox Name="PassphraseTextBox"
-               Margin="16"
+      <TextBox Margin="16"
                MinWidth="300" 
                Height="32" 
                Focusable="True"
                Text="{Binding Passphrase, Mode=TwoWay}" 
                PasswordChar="*"
                RevealPassword="{Binding ShowPassword, Mode=OneWay}"
-               HorizontalAlignment="Stretch">
+               HorizontalAlignment="Stretch"
+               v:AutoFocusBehaviour.IsEnabled="True">
         <TextBox.InnerRightContent>
           <ToggleButton Grid.Column="6"
                         Classes="toggle_untracked"
diff --git a/src/Views/Askpass.axaml.cs b/src/Views/Askpass.axaml.cs
index ab7f6048..673fd8ef 100644
--- a/src/Views/Askpass.axaml.cs
+++ b/src/Views/Askpass.axaml.cs
@@ -52,11 +52,5 @@ namespace SourceGit.Views
             Console.Out.Write($"{Passphrase}\n");
             App.Quit(0);
         }
-
-        protected override void OnOpened(EventArgs e)
-        {
-            PassphraseTextBox.Focus();
-            base.OnOpened(e);
-        }
     }
 }