diff --git a/src/App/Pages/Lock/LockPasswordPage.cs b/src/App/Pages/Lock/LockPasswordPage.cs
index b2516761f..10c2da7bd 100644
--- a/src/App/Pages/Lock/LockPasswordPage.cs
+++ b/src/App/Pages/Lock/LockPasswordPage.cs
@@ -108,7 +108,6 @@ namespace Bit.App.Pages
                 {
                     for(int i = 0; i < 5; i++)
                     {
-                        await Task.Delay(1000);
                         if(!PasswordCell.Entry.IsFocused)
                         {
                             Device.BeginInvokeOnMainThread(() => PasswordCell.Entry.FocusWithDelay());
@@ -117,6 +116,8 @@ namespace Bit.App.Pages
                         {
                             break;
                         }
+
+                        await Task.Delay(1000);
                     }
                 });
             }
diff --git a/src/App/Pages/Lock/LockPinPage.cs b/src/App/Pages/Lock/LockPinPage.cs
index e425f3af3..bc827e1ca 100644
--- a/src/App/Pages/Lock/LockPinPage.cs
+++ b/src/App/Pages/Lock/LockPinPage.cs
@@ -87,7 +87,6 @@ namespace Bit.App.Pages
                 {
                     for(int i = 0; i < 5; i++)
                     {
-                        await Task.Delay(1000);
                         if(!PinControl.Entry.IsFocused)
                         {
                             Device.BeginInvokeOnMainThread(() => PinControl.Entry.Focus());
@@ -96,6 +95,8 @@ namespace Bit.App.Pages
                         {
                             break;
                         }
+
+                        await Task.Delay(1000);
                     }
                 });
             }