diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4ac8815bdf..d777d37e9e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -5,7 +5,7 @@ parameters:
     type: boolean
     default: false
 orbs:
-  browser-tools: circleci/browser-tools@1.4.4
+  browser-tools: circleci/browser-tools@1.5.2
   win: circleci/windows@5.0
   node: circleci/node@7.0.0
 jobs:
@@ -629,7 +629,7 @@ jobs:
 
   remix-ide-browser:
     docker:
-      - image: cimg/node:20.17.0-browsers
+      - image: cimg/node:20.18.3-browsers
     resource_class:
       xlarge
     working_directory: ~/remix-project
diff --git a/apps/remix-ide-e2e/src/commands/switchBrowserTab.ts b/apps/remix-ide-e2e/src/commands/switchBrowserTab.ts
index 76db38f0aa..ef880418a1 100644
--- a/apps/remix-ide-e2e/src/commands/switchBrowserTab.ts
+++ b/apps/remix-ide-e2e/src/commands/switchBrowserTab.ts
@@ -6,11 +6,17 @@ import EventEmitter from 'events'
 */
 
 class SwitchBrowserTab extends EventEmitter {
-  command (this: NightwatchBrowser, index: number): NightwatchBrowser {
+  command(this: NightwatchBrowser, index: number): NightwatchBrowser {
     this.api.perform((browser: NightwatchAPI, done) => {
+      const runtimeBrowser = browser.options.desiredCapabilities.browserName
       browser.windowHandles((result) => {
         console.log('switching to window', result)
-        browser.switchWindow(result.value[index])
+        if (Array.isArray(result.value)) {
+          if(runtimeBrowser === 'chrome') {
+            index = index + 1
+          }
+          browser.switchWindow(result.value[index] || result.value[0])
+        }
         done()
       })
       this.emit('complete')
diff --git a/funding.json b/funding.json
new file mode 100644
index 0000000000..49e6f7d28d
--- /dev/null
+++ b/funding.json
@@ -0,0 +1,5 @@
+{
+  "opRetro": {
+    "projectId": "0x754c37e401e2527ab24b9d7ca3e042bfcbfebeef54a533f8833d46242d2c3017"
+  }
+}