diff --git a/apps/remixdesktop/test/tests/app/offline.test.ts b/apps/remixdesktop/test/tests/app/offline.test.ts
index 040e587e5e..284d44991a 100644
--- a/apps/remixdesktop/test/tests/app/offline.test.ts
+++ b/apps/remixdesktop/test/tests/app/offline.test.ts
@@ -11,9 +11,11 @@ module.exports = {
             .waitForElementVisible('*[data-id="remixIdeIconPanel"]', 10000)
             .waitForElementVisible('button[data-id="landingPageImportFromTemplate"]')
             .click('button[data-id="landingPageImportFromTemplate"]')
+            .waitForElementPresent('*[data-id="create-remixDefault"]')
+            .scrollAndClick('*[data-id="create-remixDefault"]')
             .waitForElementVisible('*[data-id="modalDialogCustomPromptTextCreate"]')
-            .waitForElementPresent('[data-id="fileSystemModalDialogModalFooter-react"] .modal-ok')
-            .click('[data-id="fileSystemModalDialogModalFooter-react"] .modal-ok')
+            .waitForElementPresent('[data-id="TemplatesSelectionModalDialogContainer-react"] .modal-ok')
+            .click('[data-id="TemplatesSelectionModalDialogContainer-react"] .modal-ok')
             .pause(3000)
             .windowHandles(function (result) {
                 console.log(result.value)
diff --git a/apps/remixdesktop/test/tests/app/search.test.ts b/apps/remixdesktop/test/tests/app/search.test.ts
index 3a10ff583e..70e3d50b30 100644
--- a/apps/remixdesktop/test/tests/app/search.test.ts
+++ b/apps/remixdesktop/test/tests/app/search.test.ts
@@ -10,9 +10,11 @@ module.exports = {
             .waitForElementVisible('*[data-id="remixIdeIconPanel"]', 10000)
             .waitForElementVisible('button[data-id="landingPageImportFromTemplate"]')
             .click('button[data-id="landingPageImportFromTemplate"]')
+            .waitForElementPresent('*[data-id="create-remixDefault"]')
+            .scrollAndClick('*[data-id="create-remixDefault"]')
             .waitForElementVisible('*[data-id="modalDialogCustomPromptTextCreate"]')
-            .waitForElementPresent('[data-id="fileSystemModalDialogModalFooter-react"] .modal-ok')
-            .click('[data-id="fileSystemModalDialogModalFooter-react"] .modal-ok')
+            .waitForElementPresent('[data-id="TemplatesSelectionModalDialogContainer-react"] .modal-ok')
+            .click('[data-id="TemplatesSelectionModalDialogContainer-react"] .modal-ok')
             .pause(3000)
             .windowHandles(function (result) {
                 console.log(result.value)
diff --git a/apps/remixdesktop/test/tests/app/slitherlinux.test.ts b/apps/remixdesktop/test/tests/app/slitherlinux.test.ts
index da2c96ddd4..21b3f38ea5 100644
--- a/apps/remixdesktop/test/tests/app/slitherlinux.test.ts
+++ b/apps/remixdesktop/test/tests/app/slitherlinux.test.ts
@@ -14,9 +14,11 @@ const tests = {
       .waitForElementVisible('*[data-id="remixIdeIconPanel"]', 10000)
       .waitForElementVisible('button[data-id="landingPageImportFromTemplate"]')
       .click('button[data-id="landingPageImportFromTemplate"]')
+      .waitForElementPresent('*[data-id="create-remixDefault"]')
+      .scrollAndClick('*[data-id="create-remixDefault"]')
       .waitForElementVisible('*[data-id="modalDialogCustomPromptTextCreate"]')
-      .waitForElementPresent('[data-id="fileSystemModalDialogModalFooter-react"] .modal-ok')
-      .click('[data-id="fileSystemModalDialogModalFooter-react"] .modal-ok')
+      .waitForElementPresent('[data-id="TemplatesSelectionModalDialogContainer-react"] .modal-ok')
+      .click('[data-id="TemplatesSelectionModalDialogContainer-react"] .modal-ok')
       .pause(3000)
       .windowHandles(function (result) {
         console.log(result.value)
diff --git a/apps/remixdesktop/test/tests/app/templates.test.ts b/apps/remixdesktop/test/tests/app/templates.test.ts
index 4c4bdc4753..86528458e9 100644
--- a/apps/remixdesktop/test/tests/app/templates.test.ts
+++ b/apps/remixdesktop/test/tests/app/templates.test.ts
@@ -10,9 +10,11 @@ module.exports = {
       .waitForElementVisible('*[data-id="remixIdeIconPanel"]', 10000)
       .waitForElementVisible('button[data-id="landingPageImportFromTemplate"]')
       .click('button[data-id="landingPageImportFromTemplate"]')
+      .waitForElementPresent('*[data-id="create-remixDefault"]')
+      .scrollAndClick('*[data-id="create-remixDefault"]')
       .waitForElementVisible('*[data-id="modalDialogCustomPromptTextCreate"]')
-      .waitForElementPresent('[data-id="fileSystemModalDialogModalFooter-react"] .modal-ok')
-      .click('[data-id="fileSystemModalDialogModalFooter-react"] .modal-ok')
+      .waitForElementPresent('[data-id="TemplatesSelectionModalDialogContainer-react"] .modal-ok')
+      .click('[data-id="TemplatesSelectionModalDialogContainer-react"] .modal-ok')
       .pause(3000)
       .windowHandles(function (result) {
         console.log(result.value)