diff --git a/WordPress/Classes/ViewRelated/NUX/LoginViewController.m b/WordPress/Classes/ViewRelated/NUX/LoginViewController.m
index b167deaaa30f..4cd2baed7283 100644
--- a/WordPress/Classes/ViewRelated/NUX/LoginViewController.m
+++ b/WordPress/Classes/ViewRelated/NUX/LoginViewController.m
@@ -412,6 +412,10 @@ - (IBAction)forgotPassword:(id)sender
 
 - (IBAction)findLoginFromOnePassword:(id)sender
 {
+    // Resign first responder
+    [self.view endEditing:NO];
+    
+    // Proceed only if needed
     if (self.userIsDotCom == false && self.siteUrlText.text.isEmpty) {
         [self displayOnePasswordEmptySiteAlert];
         return;