diff --git a/test/e2e/tests/tokens/increase-token-allowance.spec.js b/test/e2e/tests/tokens/increase-token-allowance.spec.js
index 4fb092906558..52a7d9454e38 100644
--- a/test/e2e/tests/tokens/increase-token-allowance.spec.js
+++ b/test/e2e/tests/tokens/increase-token-allowance.spec.js
@@ -232,6 +232,8 @@ describe('Increase Token Allowance', function () {
     });
     await driver.delay(2000);
 
+    // Windows: MetaMask, Test Dapp and Dialog
+    await driver.waitUntilXWindowHandles(3);
     await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
     let spendingCapElement = await driver.findElement(
       '[data-testid="custom-spending-cap-input"]',
@@ -297,6 +299,8 @@ describe('Increase Token Allowance', function () {
   }
 
   async function confirmTransferFromTokensSuccess(driver) {
+    // Windows: MetaMask, Test Dapp and Dialog
+    await driver.waitUntilXWindowHandles(3, 1000, 10000);
     await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
     await driver.waitForSelector({ text: '1.5 TST', tag: 'h1' });
     await driver.clickElement({ text: 'Confirm', tag: 'button' });