diff --git a/frontend/test/metabase-smoketest/admin_setup.cy.spec.js b/frontend/test/metabase-smoketest/admin_setup.cy.spec.js
index cc02900d360e628d9305bdf4f4feb3089ab4b77f..2fc54d048d9146bb24a023119d8485d813d1772d 100644
--- a/frontend/test/metabase-smoketest/admin_setup.cy.spec.js
+++ b/frontend/test/metabase-smoketest/admin_setup.cy.spec.js
@@ -1,11 +1,12 @@
 import {
+  popover,
   restore,
+  setupLocalHostEmail,
+  signIn,
   signInAsAdmin,
-  USERS,
-  signOut,
   signInAsNormalUser,
-  signIn,
-  setupLocalHostEmail,
+  signOut,
+  USERS,
 } from "__support__/cypress";
 
 const new_user = {
@@ -685,37 +686,41 @@ describe("smoketest > admin_setup", () => {
     });
 
     it("should add sub-collection and change its permissions as admin", () => {
-      // Adds sub-collection
+      const subCollectionName = "test sub-collection";
 
       signOut();
       signInAsAdmin();
+
       cy.visit("/collection/root");
 
       cy.findByText("Our analytics");
 
       cy.findByText("New collection").click();
-      cy.findByLabelText("Name").type("test sub-collection");
-      cy.findByLabelText("Description")
-        .wait(1)
-        .type("very descriptive of test sub-collection");
-      cy.get(".Icon-chevrondown").click();
-      cy.findAllByText("Our analytics")
-        .last()
-        .click();
 
-      cy.findByText("Create").click();
+      cy.get(".Modal").within(() => {
+        cy.findByLabelText("Name").type(subCollectionName);
+        cy.findByLabelText("Description")
+          .wait(1)
+          .type(`Very nice description for ${subCollectionName}`);
 
-      cy.get(".Icon-all");
+        cy.get(".Icon-chevrondown").click();
+      });
 
-      // Changes permissions of sub-collection
+      popover().within(() => {
+        cy.findAllByText("Our analytics")
+          .last()
+          .click();
+      });
+      cy.findByText("Create").click();
 
-      cy.findByText("test sub-collection").click();
+      // Changes permissions of sub-collection
+      cy.findByText(subCollectionName).click();
 
       cy.findByText("This collection is empty, like a blank canvas");
 
       cy.get(".Icon-lock").click();
 
-      cy.findByText("Permissions for this collection");
+      cy.findByText(`Permissions for ${subCollectionName}`);
 
       // Collection can no longer access sub-collection
       cy.wait(1)