diff --git a/e2e/src/webwallet/page-objects/Dapps.ts b/e2e/src/webwallet/page-objects/Dapps.ts
index 0785585..64d4bff 100644
--- a/e2e/src/webwallet/page-objects/Dapps.ts
+++ b/e2e/src/webwallet/page-objects/Dapps.ts
@@ -125,7 +125,7 @@ export default class Dapps extends Navigation {
 
     await expect(popup.getByText("Sign Message")).toBeVisible()
     await expect(popup.getByText("Confirm")).toBeVisible()
-    await popup.locator('button[type="submit"]').click()
+    await popup.getByText("Confirm").click({ timeout: 3000, force: true })
 
     await Promise.all([
       expect(this.dApp.getByText("Signer", { exact: true })).toBeVisible(),
@@ -168,7 +168,10 @@ export default class Dapps extends Navigation {
       popupPromise,
     ])
 
-    await popup.locator('button[type="submit"]').click()
+    await popup
+      .getByRole("button")
+      .and(popup.getByText("Start session"))
+      .click()
     await this.dApp.waitForTimeout(1000)
 
     const dialogPromise = this.dApp.waitForEvent("dialog")