diff --git a/packages/nc-gui/components/dlg/QuickImport.vue b/packages/nc-gui/components/dlg/QuickImport.vue
index 09d62b95ca..4d98ffbff2 100644
--- a/packages/nc-gui/components/dlg/QuickImport.vue
+++ b/packages/nc-gui/components/dlg/QuickImport.vue
@@ -303,6 +303,7 @@ const customReqCbk = (customReqArgs: { file: any; onSuccess: () => void }) => {
           :import-only="importOnly"
           :quick-import-type="importType"
           :max-rows-to-parse="importState.parserConfig.maxRowsToParse"
+          class="nc-quick-import-template-editor"
           @import="handleImport"
         />
 
diff --git a/packages/nc-gui/components/virtual-cell/components/ListChildItems.vue b/packages/nc-gui/components/virtual-cell/components/ListChildItems.vue
index 3ab8524bf8..f190784b47 100644
--- a/packages/nc-gui/components/virtual-cell/components/ListChildItems.vue
+++ b/packages/nc-gui/components/virtual-cell/components/ListChildItems.vue
@@ -87,7 +87,14 @@ watch(
 </script>
 
 <template>
-  <component :is="container" v-model:visible="vModel" :footer="null" title="Child list" :body-style="{ padding: 0 }">
+  <component
+    :is="container"
+    v-model:visible="vModel"
+    :footer="null"
+    title="Child list"
+    :body-style="{ padding: 0 }"
+    wrap-class-name="nc-modal-child-list"
+  >
     <div class="max-h-[max(calc(100vh_-_300px)_,500px)] flex flex-col py-6">
       <div class="flex mb-4 items-center gap-2 px-12">
         <div class="flex-1" />
diff --git a/packages/nc-gui/composables/useTable.ts b/packages/nc-gui/composables/useTable.ts
index 3246ae75d9..78278db519 100644
--- a/packages/nc-gui/composables/useTable.ts
+++ b/packages/nc-gui/composables/useTable.ts
@@ -63,6 +63,7 @@ export function useTable(onTableCreate?: (tableMeta: TableType) => void) {
     // 'Click Submit to Delete The table'
     Modal.confirm({
       title: `${t('msg.info.deleteTableConfirmation')} : ${table.title}?`,
+      wrapClassName: 'nc-modal-table-delete',
       okText: t('general.yes'),
       okType: 'danger',
       cancelText: t('general.no'),
diff --git a/packages/nc-gui/pages/index/index/index.vue b/packages/nc-gui/pages/index/index/index.vue
index daff53eeeb..929ab0fd44 100644
--- a/packages/nc-gui/pages/index/index/index.vue
+++ b/packages/nc-gui/pages/index/index/index.vue
@@ -48,6 +48,7 @@ const deleteProject = (project: ProjectType) => {
 
   Modal.confirm({
     title: `Do you want to delete '${project.title}' project?`,
+    wrapClassName: 'nc-modal-project-delete',
     okText: 'Yes',
     okType: 'danger',
     cancelText: 'No',
diff --git a/scripts/cypress/integration/common/2a_table_with_belongs_to_colulmn.js b/scripts/cypress/integration/common/2a_table_with_belongs_to_colulmn.js
index f2bf2146a7..34ac77c2f3 100644
--- a/scripts/cypress/integration/common/2a_table_with_belongs_to_colulmn.js
+++ b/scripts/cypress/integration/common/2a_table_with_belongs_to_colulmn.js
@@ -59,7 +59,7 @@ export const genTest = (apiType, dbType) => {
         });
 
         it("Expand Link record, validate", () => {
-            cy.getActiveModal(".nc-modal-link-record")
+            cy.getActiveModal(".nc-modal-child-list")
                 .find("button:contains(Link to 'City')")
                 .click()
                 .then(() => {
diff --git a/scripts/cypress/integration/common/2b_table_with_m2m_column.js b/scripts/cypress/integration/common/2b_table_with_m2m_column.js
index 8aa1fc8dd3..7d87f72260 100644
--- a/scripts/cypress/integration/common/2b_table_with_m2m_column.js
+++ b/scripts/cypress/integration/common/2b_table_with_m2m_column.js
@@ -57,7 +57,7 @@ export const genTest = (apiType, dbType) => {
             // cy.getActiveModal()
             //     .find("button:contains(Link to 'Film')")
             //     .should("exist");
-            cy.getActiveModal()
+            cy.getActiveModal(".nc-modal-child-list")
                 .find(".ant-card")
                 .eq(0)
                 .contains("ACADEMY DINOSAUR")
@@ -65,7 +65,7 @@ export const genTest = (apiType, dbType) => {
         });
 
         it('Expand "Link to" record, validate', () => {
-            cy.getActiveModal()
+            cy.getActiveModal(".nc-modal-child-list")
                 .find("button:contains(Link to 'Film')")
                 .click()
                 .then(() => {
@@ -92,7 +92,7 @@ export const genTest = (apiType, dbType) => {
             mainPage.getCell("Film List", 1).should("exist").trigger("mouseover").click();
             cy.get('.nc-action-icon').eq(0).should('exist').click({ force: true });
 
-            cy.getActiveModal()
+            cy.getActiveModal(".nc-modal-child-list")
                 .find(".ant-card")
                 .eq(0)
                 .contains("ACADEMY DINOSAUR", { timeout: 2000 })
diff --git a/scripts/cypress/integration/common/3f_link_to_another_record.js b/scripts/cypress/integration/common/3f_link_to_another_record.js
index fb973db21a..1cef8e0ed7 100644
--- a/scripts/cypress/integration/common/3f_link_to_another_record.js
+++ b/scripts/cypress/integration/common/3f_link_to_another_record.js
@@ -175,14 +175,14 @@ export const genTest = (apiType, dbType) => {
         .should("exist")
         .click({ force: true });
       cy.wait(1000);
-      cy.getActiveModal()
+      cy.getActiveModal(".nc-modal-child-list")
         .find('.ant-card').should('exist')
         .eq(0).click();
 
       // MM
       cy.get(".nc-expand-col-Sheet1.List").find(".ant-btn-primary").click();
       cy.wait(1000);
-      cy.getActiveModal()
+      cy.getActiveModal(".nc-modal-child-list")
         .find('.ant-card').should('exist')
         .eq(0).click();
 
diff --git a/scripts/cypress/integration/common/4f_pg_grid_view_share.js b/scripts/cypress/integration/common/4f_pg_grid_view_share.js
index 07c895ade3..34f8ead400 100644
--- a/scripts/cypress/integration/common/4f_pg_grid_view_share.js
+++ b/scripts/cypress/integration/common/4f_pg_grid_view_share.js
@@ -287,16 +287,16 @@ export const genTest = (apiType, dbType) => {
                     .find("button.mdi-arrow-expand")
                     .click();
 
-                cy.getActiveModal().find("button.mdi-reload").should("exist");
-                cy.getActiveModal()
+                cy.getActiveModal(".nc-modal-child-list").find("button.mdi-reload").should("exist");
+                cy.getActiveModal(".nc-modal-child-list")
                     .find("button")
                     .contains("Link to")
                     .should("not.exist");
-                cy.getActiveModal()
+                cy.getActiveModal(".nc-modal-child-list")
                     .find(".child-card")
                     .contains("2")
                     .should("exist");
-                cy.getActiveModal()
+                cy.getActiveModal(".nc-modal-child-list")
                     .find(".child-card")
                     .find("button")
                     .should("not.exist");
@@ -340,8 +340,8 @@ export const genTest = (apiType, dbType) => {
                     .find("button.mdi-arrow-expand")
                     .click();
 
-                cy.getActiveModal().find("button.mdi-reload").should("exist");
-                cy.getActiveModal()
+                cy.getActiveModal(".nc-modal-child-list").find("button.mdi-reload").should("exist");
+                cy.getActiveModal(".nc-modal-child-list")
                     .find("button")
                     .contains("Link to")
                     .should("not.exist");
diff --git a/scripts/cypress/integration/common/6e_project_operations.js b/scripts/cypress/integration/common/6e_project_operations.js
index 9c859f08ef..3013dd13b7 100644
--- a/scripts/cypress/integration/common/6e_project_operations.js
+++ b/scripts/cypress/integration/common/6e_project_operations.js
@@ -22,7 +22,7 @@ export const genTest = (apiType, dbType) => {
                 .last()
                 .click();
 
-            cy.getActiveModal()
+            cy.getActiveModal(".nc-modal-project-delete")
                 .find(".ant-btn-dangerous")
                 .should("exist")
                 .click();
diff --git a/scripts/cypress/integration/common/9a_QuickTest.js b/scripts/cypress/integration/common/9a_QuickTest.js
index 0568eaf5af..c73492490e 100644
--- a/scripts/cypress/integration/common/9a_QuickTest.js
+++ b/scripts/cypress/integration/common/9a_QuickTest.js
@@ -416,7 +416,7 @@ export const genTest = (apiType, dbType, testMode) => {
                   .last()
                   .click();
 
-                cy.getActiveModal()
+                cy.getActiveModal(".nc-modal-project-delete")
                   .find("button")
                   .contains("Submit")
                   .should("exist")