diff --git a/superset-frontend/cypress-base/cypress/integration/explore/control.test.ts b/superset-frontend/cypress-base/cypress/integration/explore/control.test.ts
index b8d3e7666e1ee..0024558629ffb 100644
--- a/superset-frontend/cypress-base/cypress/integration/explore/control.test.ts
+++ b/superset-frontend/cypress-base/cypress/integration/explore/control.test.ts
@@ -138,15 +138,20 @@ describe('Time range filter', () => {
     cy.visitChartByParams(JSON.stringify(formData));
     cy.verifySliceSuccess({ waitAlias: '@postJson' });
 
-    cy.get('[data-test=time-range-trigger]').click().then(() => {
-      cy.get('.ant-modal-footer').find('button').its('length').should('eq', 3)
-      cy.get('.ant-modal-body').within(() => {
-        cy.get('input[value="100 years ago"]');
-        cy.get('input[value="now"]');
+    cy.get('[data-test=time-range-trigger]')
+      .click()
+      .then(() => {
+        cy.get('.ant-modal-footer')
+          .find('button')
+          .its('length')
+          .should('eq', 3);
+        cy.get('.ant-modal-body').within(() => {
+          cy.get('input[value="100 years ago"]');
+          cy.get('input[value="now"]');
+        });
+        cy.get('[data-test=modal-cancel-button]').click();
+        cy.get('[data-test=time-range-modal]').should('not.be.visible');
       });
-      cy.get('[data-test=modal-cancel-button]').click();
-      cy.get('[data-test=time-range-modal]').should('not.be.visible');
-    });
   });
 });
 
diff --git a/superset-frontend/src/explore/components/controls/DateFilterControl/DateFilterControl.tsx b/superset-frontend/src/explore/components/controls/DateFilterControl/DateFilterControl.tsx
index 74a1452eb1f0e..6fb9b3c894add 100644
--- a/superset-frontend/src/explore/components/controls/DateFilterControl/DateFilterControl.tsx
+++ b/superset-frontend/src/explore/components/controls/DateFilterControl/DateFilterControl.tsx
@@ -812,7 +812,13 @@ export default function DateFilterControl(props: DateFilterLabelProps) {
         show={show}
         onHide={onHide}
         footer={[
-          <Button buttonStyle="secondary" cta key="cancel" onClick={onHide} data-test="modal-cancel-button">
+          <Button
+            buttonStyle="secondary"
+            cta
+            key="cancel"
+            onClick={onHide}
+            data-test="modal-cancel-button"
+          >
             {t('CANCEL')}
           </Button>,
           <Button