diff --git a/src/App/Pages/Accounts/TwoFactorPage.xaml b/src/App/Pages/Accounts/TwoFactorPage.xaml
index ee1a59440..3347da6f0 100644
--- a/src/App/Pages/Accounts/TwoFactorPage.xaml
+++ b/src/App/Pages/Accounts/TwoFactorPage.xaml
@@ -68,6 +68,7 @@
                 <StackLayout StyleClass="box">
                     <StackLayout StyleClass="box-row, box-row-input">
                         <Entry
+                            x:Name="_yubikeyTokenEntry"
                             Text="{Binding Token}"
                             StyleClass="box-value"
                             ReturnType="Go"
diff --git a/src/App/Pages/Accounts/TwoFactorPage.xaml.cs b/src/App/Pages/Accounts/TwoFactorPage.xaml.cs
index f400760b0..92f23ebc1 100644
--- a/src/App/Pages/Accounts/TwoFactorPage.xaml.cs
+++ b/src/App/Pages/Accounts/TwoFactorPage.xaml.cs
@@ -70,10 +70,14 @@ namespace Bit.App.Pages
             await LoadOnAppearedAsync(_scrollView, true, () =>
             {
                 _vm.Init();
-                if(_vm.TotpMethod || _vm.YubikeyMethod)
+                if(_vm.TotpMethod)
                 {
                     RequestFocus(_totpEntry);
                 }
+                else if(_vm.YubikeyMethod)
+                {
+                    RequestFocus(_yubikeyTokenEntry);
+                }
                 return Task.FromResult(0);
             });
         }