diff --git a/app/client/cypress/support/commands.js b/app/client/cypress/support/commands.js
index c51b7f3540..4b8676e761 100644
--- a/app/client/cypress/support/commands.js
+++ b/app/client/cypress/support/commands.js
@@ -629,22 +629,22 @@ Cypress.Commands.add("DeleteAPI", apiname => {
   );
 });
 
-Cypress.Commands.add("CreateModal", () => {
-  cy.get(modalWidgetPage.selectModal).click();
-  cy.get(modalWidgetPage.createModalButton).click({ force: true });
-  cy.get(modalWidgetPage.controlModalType)
-    .find(".bp3-button")
-    .click({ force: true })
-    .get("ul.bp3-menu")
-    .children()
-    .contains("Alert Modal")
-    .click();
-  cy.get(modalWidgetPage.controlModalType)
-    .find(".bp3-button > .bp3-button-text")
-    .should("have.text", "Alert Modal");
-  cy.get(commonlocators.editPropCrossButton).click();
-  cy.reload();
-});
+// Cypress.Commands.add("CreateModal", () => {
+//   cy.get(modalWidgetPage.selectModal).click();
+//   cy.get(modalWidgetPage.createModalButton).click({ force: true });
+//   cy.get(modalWidgetPage.controlModalType)
+//     .find(".bp3-button")
+//     .click({ force: true })
+//     .get("ul.bp3-menu")
+//     .children()
+//     .contains("Alert Modal")
+//     .click();
+//   cy.get(modalWidgetPage.controlModalType)
+//     .find(".bp3-button > .bp3-button-text")
+//     .should("have.text", "Alert Modal");
+//   cy.get(commonlocators.editPropCrossButton).click();
+//   cy.reload();
+// });
 
 Cypress.Commands.add("createModal", (modalType, ModalName) => {
   cy.get(widgetsPage.buttonOnClick)
@@ -686,6 +686,7 @@ Cypress.Commands.add("createModal", (modalType, ModalName) => {
     .contains("Center")
     .click();
   cy.assertPageSave();
+  cy.get(".bp3-overlay-backdrop").click({ force: true });
 });
 
 Cypress.Commands.add("CheckWidgetProperties", checkboxCss => {
diff --git a/app/client/src/components/designSystems/blueprint/ModalComponent.tsx b/app/client/src/components/designSystems/blueprint/ModalComponent.tsx
index 03206a6636..ae9ca09cff 100644
--- a/app/client/src/components/designSystems/blueprint/ModalComponent.tsx
+++ b/app/client/src/components/designSystems/blueprint/ModalComponent.tsx
@@ -15,7 +15,7 @@ const Container = styled.div<{
         z-index: ${props => props.zIndex || 2 - 1};
       }
       position: fixed;
-      top: ${props => props.theme.headerHeight};
+      top: 0;
       right: 0;
       bottom: 0;
       height: 100vh;