diff --git a/Composer/cypress/integration/Breadcrumb.spec.ts b/Composer/cypress/integration/Breadcrumb.spec.ts
index e0a0ff7eb4..9f7d373374 100644
--- a/Composer/cypress/integration/Breadcrumb.spec.ts
+++ b/Composer/cypress/integration/Breadcrumb.spec.ts
@@ -8,7 +8,7 @@ context('breadcrumb', () => {
 
     // Return to Main.dialog
     cy.findByTestId('ProjectTree').within(() => {
-      cy.findByText('__TestTodoSample').click();
+      cy.findAllByText('__TestTodoSample').last().click();
     });
   });
 
@@ -29,7 +29,7 @@ context('breadcrumb', () => {
 
     // Return to Main.dialog
     cy.findByTestId('ProjectTree').within(() => {
-      cy.findByText('__TestTodoSample').click();
+      cy.findAllByText('__TestTodoSample').last().click();
     });
 
     hasBreadcrumbItems(cy, ['__TestTodoSample']);
diff --git a/Composer/cypress/integration/CreateNewBot.spec.ts b/Composer/cypress/integration/CreateNewBot.spec.ts
index 1b9210fbbf..60822b3708 100644
--- a/Composer/cypress/integration/CreateNewBot.spec.ts
+++ b/Composer/cypress/integration/CreateNewBot.spec.ts
@@ -15,7 +15,7 @@ context('Creating a new bot', () => {
     cy.findByTestId('NextStepButton').click();
     cy.enterTextAndSubmit('NewDialogName', '__TestNewProject', 'SubmitNewBotBtn');
     cy.findByTestId('ProjectTree').within(() => {
-      cy.findByText('__TestNewProject').should('exist');
+      cy.findAllByText('__TestNewProject').should('exist');
     });
   });
 
@@ -25,7 +25,7 @@ context('Creating a new bot', () => {
     cy.findByTestId('NextStepButton').click();
     cy.enterTextAndSubmit('NewDialogName', '__TestNewProject2', 'SubmitNewBotBtn');
     cy.findByTestId('ProjectTree').within(() => {
-      cy.findByText('__TestNewProject2').should('exist');
+      cy.findAllByText('__TestNewProject2').should('exist');
       cy.findByText('addtodo').should('exist');
       cy.findByText('cleartodos').should('exist');
       cy.findByText('deletetodo').should('exist');
diff --git a/Composer/cypress/integration/LGPage.spec.ts b/Composer/cypress/integration/LGPage.spec.ts
index 7f935451ea..c08ac53ed0 100644
--- a/Composer/cypress/integration/LGPage.spec.ts
+++ b/Composer/cypress/integration/LGPage.spec.ts
@@ -29,7 +29,7 @@ context('LG Page', () => {
 
     // nav to Main dialog
     cy.findByTestId('ProjectTree').within(() => {
-      cy.findByText('__TestTodoSample').click();
+      cy.findAllByText('__TestTodoSample').last().click();
     });
   });
 });
diff --git a/Composer/cypress/integration/LUPage.spec.ts b/Composer/cypress/integration/LUPage.spec.ts
index 05704f40a1..c4b1c8df42 100644
--- a/Composer/cypress/integration/LUPage.spec.ts
+++ b/Composer/cypress/integration/LUPage.spec.ts
@@ -23,7 +23,7 @@ context('LU Page', () => {
 
     // nav to ToDoBotWithLuisSample.main dialog
     cy.findByTestId('ProjectTree').within(() => {
-      cy.findByText('__TestToDoBotWithLuisSample').click('left');
+      cy.findAllByText('__TestToDoBotWithLuisSample').last().click('left');
     });
     cy.findByTestId('showcode').as('switchButton');
     // goto edit-mode
diff --git a/Composer/cypress/integration/NotificationPage.spec.ts b/Composer/cypress/integration/NotificationPage.spec.ts
index 49a0c50045..58258cb6f1 100644
--- a/Composer/cypress/integration/NotificationPage.spec.ts
+++ b/Composer/cypress/integration/NotificationPage.spec.ts
@@ -25,7 +25,7 @@ context('Notification Page', () => {
     cy.visitPage('User Input');
 
     cy.findByTestId('ProjectTree').within(() => {
-      cy.findByText('__TestToDoBotWithLuisSample').click();
+      cy.findAllByText('__TestToDoBotWithLuisSample').last().click();
     });
 
     cy.findByTestId('showcode').click();
diff --git a/Composer/cypress/integration/SaveAs.spec.ts b/Composer/cypress/integration/SaveAs.spec.ts
index c7e2a63b54..cc5948acee 100644
--- a/Composer/cypress/integration/SaveAs.spec.ts
+++ b/Composer/cypress/integration/SaveAs.spec.ts
@@ -14,7 +14,7 @@ context('Saving As', () => {
     cy.findByText('Save as').click();
     cy.enterTextAndSubmit('NewDialogName', '__TestSaveAs', 'SubmitNewBotBtn');
     cy.findByTestId('ProjectTree').within(() => {
-      cy.findByText('__TestSaveAs').should('exist');
+      cy.findAllByText('__TestSaveAs').should('exist');
     });
   });
 });
diff --git a/Composer/cypress/integration/ToDoBot.spec.ts b/Composer/cypress/integration/ToDoBot.spec.ts
index 4625c90421..8af24257ca 100644
--- a/Composer/cypress/integration/ToDoBot.spec.ts
+++ b/Composer/cypress/integration/ToDoBot.spec.ts
@@ -11,10 +11,10 @@ context('ToDo Bot', () => {
 
   it('can open the main dialog', () => {
     cy.findByTestId('ProjectTree').within(() => {
-      cy.findByText('__TestTodoSample').click();
+      cy.findAllByText('__TestTodoSample').last().click();
     });
     cy.withinEditor('PropertyEditor', () => {
-      cy.findByDisplayValue('__TestTodoSample').should('exist');
+      cy.findAllByDisplayValue('__TestTodoSample').should('exist');
     });
   });
 
diff --git a/Composer/cypress/integration/VisualDesigner.spec.ts b/Composer/cypress/integration/VisualDesigner.spec.ts
index 470c42de97..6c44924333 100644
--- a/Composer/cypress/integration/VisualDesigner.spec.ts
+++ b/Composer/cypress/integration/VisualDesigner.spec.ts
@@ -7,7 +7,7 @@ context('Visual Designer', () => {
     cy.createBot('TodoSample');
     // Return to Main.dialog
     cy.findByTestId('ProjectTree').within(() => {
-      cy.findByText('__TestTodoSample').click();
+      cy.findAllByText('__TestTodoSample').last().click();
     });
   });