diff --git a/src/features/add-cluster/__snapshots__/navigation-using-application-menu.test.tsx.snap b/src/features/add-cluster/__snapshots__/navigation-using-application-menu.test.tsx.snap
index 991a77480a..87957f581a 100644
--- a/src/features/add-cluster/__snapshots__/navigation-using-application-menu.test.tsx.snap
+++ b/src/features/add-cluster/__snapshots__/navigation-using-application-menu.test.tsx.snap
@@ -298,6 +298,7 @@ exports[`add-cluster - navigation using application menu when navigating to add
             >
               <button
                 class="Button primary"
+                data-waiting="false"
                 disabled=""
                 type="button"
               >
diff --git a/src/features/extensions/__snapshots__/navigation-using-application-menu.test.ts.snap b/src/features/extensions/__snapshots__/navigation-using-application-menu.test.ts.snap
index c3d9431eb2..118c5b9cc3 100644
--- a/src/features/extensions/__snapshots__/navigation-using-application-menu.test.ts.snap
+++ b/src/features/extensions/__snapshots__/navigation-using-application-menu.test.ts.snap
@@ -306,6 +306,7 @@ exports[`extensions - navigation using application menu when navigating to exten
                   <div>
                     <button
                       class="Button button primary"
+                      data-waiting="false"
                       type="button"
                     >
                       Install
diff --git a/src/features/helm-charts/__snapshots__/add-custom-helm-repository-in-preferences.test.ts.snap b/src/features/helm-charts/__snapshots__/add-custom-helm-repository-in-preferences.test.ts.snap
index 8f83091fcc..c02c727480 100644
--- a/src/features/helm-charts/__snapshots__/add-custom-helm-repository-in-preferences.test.ts.snap
+++ b/src/features/helm-charts/__snapshots__/add-custom-helm-repository-in-preferences.test.ts.snap
@@ -6316,6 +6316,7 @@ exports[`add custom helm repository in preferences when navigating to preference
             <button
               class="Button waiting primary"
               data-testid="custom-helm-repository-submit-button"
+              data-waiting="true"
               type="submit"
             >
               Add
diff --git a/src/features/helm-releases/__snapshots__/showing-details-for-helm-release.test.ts.snap b/src/features/helm-releases/__snapshots__/showing-details-for-helm-release.test.ts.snap
index ae169ab2f4..b717949f66 100644
--- a/src/features/helm-releases/__snapshots__/showing-details-for-helm-release.test.ts.snap
+++ b/src/features/helm-releases/__snapshots__/showing-details-for-helm-release.test.ts.snap
@@ -7430,6 +7430,7 @@ exports[`showing details for helm release given application is started when navi
               <button
                 class="Button primary"
                 data-testid="helm-release-configuration-save-button"
+                data-waiting="false"
                 type="button"
               >
                 Save
@@ -8668,6 +8669,7 @@ exports[`showing details for helm release given application is started when navi
               <button
                 class="Button primary"
                 data-testid="helm-release-configuration-save-button"
+                data-waiting="false"
                 type="button"
               >
                 Save
@@ -9906,6 +9908,7 @@ exports[`showing details for helm release given application is started when navi
               <button
                 class="Button waiting primary"
                 data-testid="helm-release-configuration-save-button"
+                data-waiting="true"
                 type="button"
               >
                 Save
@@ -10971,6 +10974,7 @@ exports[`showing details for helm release given application is started when navi
               <button
                 class="Button primary"
                 data-testid="helm-release-configuration-save-button"
+                data-waiting="false"
                 type="button"
               >
                 Save
@@ -12037,6 +12041,7 @@ exports[`showing details for helm release given application is started when navi
               <button
                 class="Button primary"
                 data-testid="helm-release-configuration-save-button"
+                data-waiting="false"
                 disabled=""
                 type="button"
               >
@@ -13276,6 +13281,7 @@ exports[`showing details for helm release given application is started when navi
               <button
                 class="Button primary"
                 data-testid="helm-release-configuration-save-button"
+                data-waiting="false"
                 type="button"
               >
                 Save
diff --git a/src/renderer/components/button/button.tsx b/src/renderer/components/button/button.tsx
index 756f50a584..8168c2abf3 100644
--- a/src/renderer/components/button/button.tsx
+++ b/src/renderer/components/button/button.tsx
@@ -49,7 +49,11 @@ export const Button = withTooltip((props: ButtonProps) => {
 
   // render as button
   return (
-    <button type="button" {...btnProps}>
+    <button
+      type="button"
+      {...btnProps}
+      data-waiting={typeof waiting === "boolean" ? String(waiting) : undefined}
+    >
       {label}
       {children}
     </button>
diff --git a/src/renderer/components/kube-object-menu/__snapshots__/kube-object-menu.test.tsx.snap b/src/renderer/components/kube-object-menu/__snapshots__/kube-object-menu.test.tsx.snap
index 372c6482eb..d4714c2b3c 100644
--- a/src/renderer/components/kube-object-menu/__snapshots__/kube-object-menu.test.tsx.snap
+++ b/src/renderer/components/kube-object-menu/__snapshots__/kube-object-menu.test.tsx.snap
@@ -126,6 +126,7 @@ exports[`kube-object-menu given kube object when removing kube object renders 1`
         <button
           class="Button ok primary"
           data-testid="confirm"
+          data-waiting="false"
           type="button"
         >
           Remove
@@ -256,6 +257,7 @@ exports[`kube-object-menu given kube object when rerendered with different kube
         <button
           class="Button ok primary"
           data-testid="confirm"
+          data-waiting="false"
           type="button"
         >
           Remove
@@ -350,6 +352,7 @@ exports[`kube-object-menu given kube object with namespace when removing kube ob
         <button
           class="Button ok primary"
           data-testid="confirm"
+          data-waiting="false"
           type="button"
         >
           Remove
@@ -444,6 +447,7 @@ exports[`kube-object-menu given kube object without namespace when removing kube
         <button
           class="Button ok primary"
           data-testid="confirm"
+          data-waiting="false"
           type="button"
         >
           Remove