diff --git a/ui-ngx/src/app/modules/home/components/calculated-fields/components/dialog/calculated-field-dialog.component.html b/ui-ngx/src/app/modules/home/components/calculated-fields/components/dialog/calculated-field-dialog.component.html
index f1e6905aab..5b11b603ee 100644
--- a/ui-ngx/src/app/modules/home/components/calculated-fields/components/dialog/calculated-field-dialog.component.html
+++ b/ui-ngx/src/app/modules/home/components/calculated-fields/components/dialog/calculated-field-dialog.component.html
@@ -183,7 +183,7 @@
     </button>
     <button mat-raised-button color="primary"
             (click)="add()"
-            [disabled]="fieldFormGroup.invalid || !fieldFormGroup.dirty">
+            [disabled]="(isLoading$ | async) || fieldFormGroup.invalid || !fieldFormGroup.dirty">
       {{ data.buttonTitle | translate }}
     </button>
   </div>