diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/FormWidgets/CheckBox_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/FormWidgets/CheckBox_spec.js
index e987207b66..f3503292c7 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/FormWidgets/CheckBox_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/FormWidgets/CheckBox_spec.js
@@ -81,7 +81,7 @@ describe("Checkbox Widget Functionality", function() {
     cy.get(publish.checkboxWidget).click();
     cy.get(widgetsPage.formButtonWidget)
       .contains("Submit")
-      .should("have.attr", "disabled");
+      .should("have.class", "bp3-disabled");
 
     cy.get(publish.checkboxWidget).click();
     cy.get(widgetsPage.formButtonWidget)
diff --git a/app/client/src/components/designSystems/blueprint/ButtonComponent.tsx b/app/client/src/components/designSystems/blueprint/ButtonComponent.tsx
index daa1459448..7c62f26290 100644
--- a/app/client/src/components/designSystems/blueprint/ButtonComponent.tsx
+++ b/app/client/src/components/designSystems/blueprint/ButtonComponent.tsx
@@ -42,7 +42,7 @@ const AccentColorMap: Record<ButtonStyleName, string> = {
 };
 
 const ButtonWrapper = styled((props: ButtonStyleProps & IButtonProps) => (
-  <Button {..._.omit(props, ["accent", "filled"])} />
+  <Button {..._.omit(props, ["accent", "filled", "disabled"])} />
 ))<ButtonStyleProps>`
   &&&& {
     ${ButtonColorStyles};
@@ -122,7 +122,10 @@ type ButtonStyleProps = {
 
 // To be used in any other part of the app
 export function BaseButton(props: IButtonProps & ButtonStyleProps) {
-  return <ButtonWrapper {...props} />;
+  const className = props.disabled
+    ? `${props.className} bp3-disabled`
+    : props.className;
+  return <ButtonWrapper {...props} className={className} />;
 }
 
 BaseButton.defaultProps = {