diff --git a/appium/tests/screenobjects/create-key.screen.ts b/appium/tests/screenobjects/create-key.screen.ts
index 470023f23..483b2c733 100644
--- a/appium/tests/screenobjects/create-key.screen.ts
+++ b/appium/tests/screenobjects/create-key.screen.ts
@@ -31,6 +31,16 @@ class CreateKeyScreen extends BaseScreen {
     }
 
     setPassPhrase(text: string = CommonData.account.passPhrase) {
+        // retrying several times because following login, we switch
+        //   from webview to our own view and then to another one several
+        //   times, which was causing flaky tests. Originally we did a 10s
+        //   delay but now instead we're retrying once per second until
+        //   we see what we expect.
+        let count = 0;
+        do {
+            browser.pause(1000);
+            count++;
+        } while(this.enterPassPhraseField.isDisplayed() !== true && count <= 15);
         this.fillPassPhrase(text);
         this.clickSetPassPhraseBtn();
         this.confirmPassPhrase(text);
diff --git a/appium/tests/screenobjects/splash.screen.ts b/appium/tests/screenobjects/splash.screen.ts
index 745a57ea4..218116b38 100644
--- a/appium/tests/screenobjects/splash.screen.ts
+++ b/appium/tests/screenobjects/splash.screen.ts
@@ -156,7 +156,7 @@ class SplashScreen extends BaseScreen {
         this.clickContinueBtn();
         this.changeLanguage();
         this.gmailLogin(email, password);
-        browser.pause(10000); // STABILITY FIX UNTIL WE WLL FIGURE OUT WITH ISSUE
+        ElementHelper.waitElementInvisible(this.signInAsGoogleAccounLabel);
     }
 }