diff --git a/apps/browser-extension-wallet/src/components/MainLoader/MainLoader.tsx b/apps/browser-extension-wallet/src/components/MainLoader/MainLoader.tsx
index 5e65f0234b..9603e60b6c 100644
--- a/apps/browser-extension-wallet/src/components/MainLoader/MainLoader.tsx
+++ b/apps/browser-extension-wallet/src/components/MainLoader/MainLoader.tsx
@@ -12,8 +12,8 @@ export const MainLoader = ({ text }: MainLoaderProps): React.ReactElement => {
 
   return (
     <div className={styles.loaderContainer} data-testid="main-loader">
-      <Loader className={styles.loader} />
-      <p>{text ?? t('general.loading')}</p>
+      <Loader className={styles.loader} data-testid="main-loader-image" />
+      <p data-testid="main-loader-text">{text ?? t('general.loading')}</p>
     </div>
   );
 };
diff --git a/packages/e2e-tests/src/elements/MainLoader.ts b/packages/e2e-tests/src/elements/MainLoader.ts
new file mode 100644
index 0000000000..9fe99cc308
--- /dev/null
+++ b/packages/e2e-tests/src/elements/MainLoader.ts
@@ -0,0 +1,19 @@
+class MainLoader {
+  private MAIN_LOADER_COMPONENT = '[data-testid="main-loader"]';
+  private MAIN_LOADER_IMAGE = '[data-testid="main-image"]';
+  private MAIN_LOADER_TEXT = '[data-testid="main-text"]';
+
+  get component() {
+    return $(this.MAIN_LOADER_COMPONENT);
+  }
+
+  get image() {
+    return $(this.MAIN_LOADER_IMAGE);
+  }
+
+  get text() {
+    return $(this.MAIN_LOADER_TEXT);
+  }
+}
+
+export default new MainLoader();
diff --git a/packages/e2e-tests/src/features/OnboardingRestoreWallet.feature b/packages/e2e-tests/src/features/OnboardingRestoreWallet.feature
index c408725426..65d02a7448 100755
--- a/packages/e2e-tests/src/features/OnboardingRestoreWallet.feature
+++ b/packages/e2e-tests/src/features/OnboardingRestoreWallet.feature
@@ -309,9 +309,11 @@ Feature: Onboarding - Restore wallet
   @LW-4743
   Scenario: Restore wallet - Enter and Escape buttons support
     Given I click "Restore" button on wallet setup page
+    And "Restoring a multi-address wallet?" modal is displayed
     When I press keyboard Escape button
     Then "Get started" page is displayed
     Given I click "Restore" button on wallet setup page
+    And "Restoring a multi-address wallet?" modal is displayed
     When I press keyboard Enter button
     Then "Legal page" is displayed
     When I press keyboard Enter button
diff --git a/packages/e2e-tests/src/features/SettingsPagePopup.feature b/packages/e2e-tests/src/features/SettingsPagePopup.feature
index ab84522108..aa2a5cd164 100644
--- a/packages/e2e-tests/src/features/SettingsPagePopup.feature
+++ b/packages/e2e-tests/src/features/SettingsPagePopup.feature
@@ -193,7 +193,7 @@ Feature: General Settings - Popup View
     And I see address count: 3
     When I switch network to: "Mainnet" in popup mode
     And  I open address book in popup mode
-    Then I see information about empty address book
+    Then I see empty address book
     When I switch network to: "Preprod" in popup mode
     And  I open address book in popup mode
     Then I see address count: 3
@@ -204,7 +204,7 @@ Feature: General Settings - Popup View
     And I see address count: 3
     When I switch network to: "Preprod" in popup mode
     And  I open address book in popup mode
-    Then I see information about empty address book
+    Then I see empty address book
 
   @LW-5472 @Testnet
   Scenario: Popup View - Settings - Addresses entered in Preprod context are not available when switching to Preview
diff --git a/packages/e2e-tests/src/features/StakingPageExtended.feature b/packages/e2e-tests/src/features/StakingPageExtended.feature
index f6df942434..beb0644345 100644
--- a/packages/e2e-tests/src/features/StakingPageExtended.feature
+++ b/packages/e2e-tests/src/features/StakingPageExtended.feature
@@ -32,7 +32,7 @@ Feature: Staking Page - Extended Browser View
       | NED#                   | 0                 |                                  |                     |
       | PAN                    | 1                 | PANL Stake Pool (Pre-Production) | PANL                |
       | 123456                 | 0                 |                                  |                     |
-      | LB                     | 2                 | LBCrypt Preview/Preprod Pool     | LBCT2               |
+      | AZ                     | 2                 | AzureADA                         | AZUR                |
       | £££                    | 0                 |                                  |                     |
       | Amso                   | 0                 |                                  |                     |
 
diff --git a/packages/e2e-tests/src/pageobject/stakingPageObject.ts b/packages/e2e-tests/src/pageobject/stakingPageObject.ts
index 079c8159f4..e69eb37805 100644
--- a/packages/e2e-tests/src/pageobject/stakingPageObject.ts
+++ b/packages/e2e-tests/src/pageobject/stakingPageObject.ts
@@ -13,7 +13,8 @@ class StakingPageObject {
   async fillSearch(term: string) {
     await StakingPage.stakingPageSearchInput.waitForEnabled();
     await StakingPage.stakingPageSearchInput.scrollIntoView();
-    await StakingPage.stakingPageSearchInput.setValue(term);
+    await StakingPage.stakingPageSearchInput.click();
+    await browser.keys([...term]);
     await browser.pause(500);
   }
 
diff --git a/packages/e2e-tests/src/steps/onboardingSteps.ts b/packages/e2e-tests/src/steps/onboardingSteps.ts
index bffd82d32e..80b519cd65 100644
--- a/packages/e2e-tests/src/steps/onboardingSteps.ts
+++ b/packages/e2e-tests/src/steps/onboardingSteps.ts
@@ -35,6 +35,7 @@ import TokensPageAssert from '../assert/tokensPageAssert';
 import TopNavigationAssert from '../assert/topNavigationAssert';
 import testContext from '../utils/testContext';
 import webTester from '../actor/webTester';
+import MainLoader from '../elements/MainLoader';
 
 const mnemonicWords: string[] = getTestWallet(TestWalletName.TestAutomationWallet).mnemonic;
 const invalidMnemonicWords: string[] = getTestWallet(TestWalletName.InvalidMnemonic).mnemonic;
@@ -537,6 +538,8 @@ Then(/^"Next" button is (enabled|disabled) during onboarding process$/, async (s
 When(
   /^I click "(Got it|Learn more)" button on "DApp connector is now in Beta" modal$/,
   async (button: 'Got it' | 'Learn more') => {
+    // Wait for main page to finish loading
+    await MainLoader.component.waitForDisplayed({ reverse: true, timeout: 3000 });
     if (button === 'Got it') {
       await Modal.cancelButton.waitForClickable();
       await Modal.cancelButton.click();