diff --git a/e2e/modules/environment.js b/e2e/modules/environment.js
index 933c915c..d226fc9b 100644
--- a/e2e/modules/environment.js
+++ b/e2e/modules/environment.js
@@ -217,6 +217,13 @@ module.exports = {
         await window.waitForSelector('#input_loginId');
         await window.waitForSelector('#input_password-input');
         await window.waitForSelector('#saveSetting');
+
+        // Do this twice because sometimes the app likes to load the login screen, then go to Loading... again
+        await asyncSleep(1000);
+        await window.waitForSelector('#input_loginId');
+        await window.waitForSelector('#input_password-input');
+        await window.waitForSelector('#saveSetting');
+
         await window.type('#input_loginId', 'user-1');
         await window.type('#input_password-input', 'SampleUs@r-1');
         await window.click('#saveSetting');