diff --git a/src/App/Pages/LoginTwoFactorPage.cs b/src/App/Pages/LoginTwoFactorPage.cs
index f70515951..40c4c3899 100644
--- a/src/App/Pages/LoginTwoFactorPage.cs
+++ b/src/App/Pages/LoginTwoFactorPage.cs
@@ -252,15 +252,20 @@ namespace Bit.App.Pages
             base.OnAppearing();
             ListenYubiKey(true);
 
+            InitEvents();
+            if(TokenCell == null && Device.RuntimePlatform == Device.Android)
+            {
+                MessagingCenter.Send(Application.Current, "DismissKeyboard");
+            }
+        }
+
+        private void InitEvents()
+        {
             if(TokenCell != null)
             {
                 TokenCell.InitEvents();
                 TokenCell.Entry.Completed += Entry_Completed;
             }
-            else if(Device.RuntimePlatform == Device.Android)
-            {
-                MessagingCenter.Send(Application.Current, "DismissKeyboard");
-            }
         }
 
         protected override void OnDisappearing()
@@ -336,6 +341,7 @@ namespace Bit.App.Pages
                 Init();
                 ListenYubiKey(false, beforeProviderType == TwoFactorProviderType.YubiKey);
                 ListenYubiKey(true);
+                InitEvents();
             }
         }