diff --git a/SimplenoteUITests/EmailLogin.swift b/SimplenoteUITests/EmailLogin.swift
index 22041a7f6..9c3e3431b 100644
--- a/SimplenoteUITests/EmailLogin.swift
+++ b/SimplenoteUITests/EmailLogin.swift
@@ -35,6 +35,7 @@ class EmailLogin {
     class func logIn(email: String, password: String) {
         enterEmail(enteredValue: email)
         app.buttons[UID.Button.continueWithPassword].tap()
+        _ = app.buttons[UID.Button.logIn].waitForExistence(timeout: minLoadTimeout)
         enterPassword(enteredValue: password)
         app.buttons[UID.Button.logIn].tap()
         handleSavePasswordPrompt()