diff --git a/packages/main/src/components/VariantManagement/ManageViewsDialog.tsx b/packages/main/src/components/VariantManagement/ManageViewsDialog.tsx
index f6dd74af522..4e4e5cfc2af 100644
--- a/packages/main/src/components/VariantManagement/ManageViewsDialog.tsx
+++ b/packages/main/src/components/VariantManagement/ManageViewsDialog.tsx
@@ -103,7 +103,7 @@ export const ManageViewsDialog = (props: ManageViewsDialogPropTypes) => {
           {defaultHeaderText}
         </TableHeaderCell>
       )}
-      {TableHeaderCell && (
+      {showApplyAutomatically && (
         <TableHeaderCell minWidth={hasApplyAutomaticallyText ? '25rem' : '5rem'}>
           {applyAutomaticallyHeaderText}
         </TableHeaderCell>
diff --git a/packages/main/src/components/VariantManagement/VariantManagement.cy.tsx b/packages/main/src/components/VariantManagement/VariantManagement.cy.tsx
index 050d4ef3240..f873ff7dafb 100644
--- a/packages/main/src/components/VariantManagement/VariantManagement.cy.tsx
+++ b/packages/main/src/components/VariantManagement/VariantManagement.cy.tsx
@@ -337,6 +337,15 @@ describe('VariantManagement', () => {
     cy.get('[text="Apply Automatically"]').should('be.visible');
     cy.get('[ui5-checkbox]').should('have.length', 3);
 
+    cy.realPress('Escape');
+
+    cy.get('[icon="navigation-down-arrow"]').click();
+    cy.findByText('Manage').click();
+    cy.get('[ui5-table]').contains('Apply Automatically').should('be.visible');
+    cy.get('[ui5-table]').contains('Default').should('be.visible');
+    cy.get('[ui5-table]').contains('Sharing').should('be.visible');
+    cy.get('[ui5-table]').contains('Created By').should('be.visible');
+
     cy.mount(
       <VariantManagement hideApplyAutomatically hideSetAsDefault hideShare hideCreatedBy>
         {TwoVariantItems}
@@ -348,6 +357,15 @@ describe('VariantManagement', () => {
     cy.get('[text="Public"]', { timeout: 50 }).should('not.exist');
     cy.get('[text="Apply Automatically"]', { timeout: 50 }).should('not.exist');
     cy.get('[ui5-checkbox]').should('not.exist');
+
+    cy.realPress('Escape');
+
+    cy.get('[icon="navigation-down-arrow"]').click();
+    cy.findByText('Manage').click();
+    cy.get('[ui5-table]').contains('Apply Automatically').should('not.exist');
+    cy.get('[ui5-table]').contains('Default').should('not.exist');
+    cy.get('[ui5-table]').contains('Sharing').should('not.exist');
+    cy.get('[ui5-table]').contains('Created By').should('not.exist');
   });
 
   it('Save As', () => {