diff --git a/appium/tests/screenobjects/email.screen.ts b/appium/tests/screenobjects/email.screen.ts
index 8342c7e57..de1cdf295 100644
--- a/appium/tests/screenobjects/email.screen.ts
+++ b/appium/tests/screenobjects/email.screen.ts
@@ -233,9 +233,10 @@ class EmailScreen extends BaseScreen {
 
   clickToggleQuoteButton = async (index: number) => {
     const element = await $(`~aid-message-${index}-quote-toggle`);
+    await TouchHelper.scrollDown();
     if (await element.isDisplayed()) {
       await ElementHelper.waitAndClick(element);
-      await TouchHelper.scrollDownToElement(element);
+      await TouchHelper.scrollDown();
     }
   };
 
diff --git a/appium/tests/screenobjects/refresh-key.screen.ts b/appium/tests/screenobjects/refresh-key.screen.ts
index dfbabe2f1..ce4d2c7de 100644
--- a/appium/tests/screenobjects/refresh-key.screen.ts
+++ b/appium/tests/screenobjects/refresh-key.screen.ts
@@ -34,13 +34,7 @@ class RefreshKeyScreen extends BaseScreen {
   };
 
   cancelRefresh = async () => {
-    try {
-      await ElementHelper.waitAndClick(await this.cancelButton);
-    } catch {
-      // For some reason clicking cancel button with aid-cancel-button identifier doesn't work. Try to click with click text identifier
-      // https://flowcrypt.semaphoreci.com/jobs/fdde00a1-33b1-4df9-a9b8-49d546c2ef79/summary?report_id=4ae71336-e44b-39bf-b9d2-752e234818a5&test_id=8e5e69c0-6bc7-316b-ab4d-7b75d419353e
-      await ElementHelper.waitAndClick(await $('//*[@name="Cancel"]'));
-    }
+    await driver.dismissAlert();
   };
 
   clickOkButton = async () => {
diff --git a/appium/tests/specs/mock/setup/CheckRefreshKeyFromEkmWithPassPhrasePrompt.spec.ts b/appium/tests/specs/mock/setup/CheckRefreshKeyFromEkmWithPassPhrasePrompt.spec.ts
index 9d8efb2ed..db5f22693 100644
--- a/appium/tests/specs/mock/setup/CheckRefreshKeyFromEkmWithPassPhrasePrompt.spec.ts
+++ b/appium/tests/specs/mock/setup/CheckRefreshKeyFromEkmWithPassPhrasePrompt.spec.ts
@@ -37,7 +37,6 @@ describe('SETUP: ', () => {
       await RefreshKeyScreen.clickOkButton();
       await BaseScreen.checkModalMessage(CommonData.refreshingKeysFromEkm.wrongPassPhrase);
       await RefreshKeyScreen.clickSystemOkButton();
-      await browser.pause(500);
       await RefreshKeyScreen.cancelRefresh();
       await KeysScreen.openScreenFromSideMenu();
       await KeysScreen.checkKeysScreen([ekmKeySamples.key0]);