diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dictionary-dialog/add-edit-dictionary-dialog.component.html b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dictionary-dialog/add-edit-dictionary-dialog.component.html
index 0b5378a37..2e69716c7 100644
--- a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dictionary-dialog/add-edit-dictionary-dialog.component.html
+++ b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dictionary-dialog/add-edit-dictionary-dialog.component.html
@@ -95,7 +95,7 @@
         </div>
 
         <div class="dialog-actions">
-            <button [disabled]="!valid || !changed" color="primary" mat-flat-button>
+            <button (click)="save()" [disabled]="!valid || !changed" color="primary" mat-flat-button>
                 {{ 'add-edit-dictionary.save' | translate }}
             </button>
         </div>
diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-attribute-dialog/add-edit-dossier-attribute-dialog.component.html b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-attribute-dialog/add-edit-dossier-attribute-dialog.component.html
index 3bb9ea807..ab55a854a 100644
--- a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-attribute-dialog/add-edit-dossier-attribute-dialog.component.html
+++ b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-attribute-dialog/add-edit-dossier-attribute-dialog.component.html
@@ -35,7 +35,7 @@
             </div>
         </div>
         <div class="dialog-actions">
-            <button [disabled]="form.invalid || !changed" color="primary" mat-flat-button>
+            <button (click)="save()" [disabled]="form.invalid || !changed" color="primary" mat-flat-button>
                 {{ 'add-edit-dossier-attribute.save' | translate }}
             </button>
         </div>
diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-attribute-dialog/add-edit-dossier-attribute-dialog.component.ts b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-attribute-dialog/add-edit-dossier-attribute-dialog.component.ts
index 310fb7800..96642be2e 100644
--- a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-attribute-dialog/add-edit-dossier-attribute-dialog.component.ts
+++ b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-attribute-dialog/add-edit-dossier-attribute-dialog.component.ts
@@ -30,19 +30,6 @@ export class AddEditDossierAttributeDialogComponent extends AutoUnsubscribe impl
         super();
     }
 
-    private _getForm(dossierAttribute: IDossierAttributeConfig): FormGroup {
-        return this._formBuilder.group({
-            label: [dossierAttribute?.label, Validators.required],
-            ...(!!dossierAttribute && {
-                placeholder: {
-                    value: dossierAttribute.placeholder,
-                    disabled: true,
-                },
-            }),
-            type: [dossierAttribute?.type || FileAttributeConfigTypes.TEXT, Validators.required],
-        });
-    }
-
     get changed(): boolean {
         if (!this.dossierAttribute) {
             return true;
@@ -57,7 +44,7 @@ export class AddEditDossierAttributeDialogComponent extends AutoUnsubscribe impl
         return false;
     }
 
-    saveDossierAttribute() {
+    save() {
         this._loadingService.start();
 
         const attribute: IDossierAttributeConfig = {
@@ -81,7 +68,20 @@ export class AddEditDossierAttributeDialogComponent extends AutoUnsubscribe impl
     onEnter(event: KeyboardEvent): void {
         const node = (event.target as IqserEventTarget).localName;
         if (this.form.valid && this.changed && node !== 'textarea') {
-            this.saveDossierAttribute();
+            this.save();
         }
     }
+
+    private _getForm(dossierAttribute: IDossierAttributeConfig): FormGroup {
+        return this._formBuilder.group({
+            label: [dossierAttribute?.label, Validators.required],
+            ...(!!dossierAttribute && {
+                placeholder: {
+                    value: dossierAttribute.placeholder,
+                    disabled: true,
+                },
+            }),
+            type: [dossierAttribute?.type || FileAttributeConfigTypes.TEXT, Validators.required],
+        });
+    }
 }
diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-template-dialog/add-edit-dossier-template-dialog.component.html b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-template-dialog/add-edit-dossier-template-dialog.component.html
index 2bd9b5a53..a8ee5cdf2 100644
--- a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-template-dialog/add-edit-dossier-template-dialog.component.html
+++ b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-template-dialog/add-edit-dossier-template-dialog.component.html
@@ -87,7 +87,7 @@
         </div>
 
         <div class="dialog-actions">
-            <button [disabled]="!valid || !changed" color="primary" mat-flat-button>
+            <button (click)="save()" [disabled]="!valid || !changed" color="primary" mat-flat-button>
                 {{ 'add-edit-dossier-template.save' | translate }}
             </button>
         </div>
diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component.html b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component.html
index ac1d3a8e8..4715598f6 100644
--- a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component.html
+++ b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component.html
@@ -84,7 +84,7 @@
             </div>
         </div>
         <div class="dialog-actions">
-            <button [disabled]="!valid || !changed" color="primary" mat-flat-button>
+            <button (click)="save()" [disabled]="!valid || !changed" color="primary" mat-flat-button>
                 {{ 'add-edit-file-attribute.save' | translate }}
             </button>
         </div>
diff --git a/apps/red-ui/src/app/modules/admin/dialogs/edit-color-dialog/edit-color-dialog.component.html b/apps/red-ui/src/app/modules/admin/dialogs/edit-color-dialog/edit-color-dialog.component.html
index d5d542d30..1d42f37a4 100644
--- a/apps/red-ui/src/app/modules/admin/dialogs/edit-color-dialog/edit-color-dialog.component.html
+++ b/apps/red-ui/src/app/modules/admin/dialogs/edit-color-dialog/edit-color-dialog.component.html
@@ -28,7 +28,7 @@
         </div>
 
         <div class="dialog-actions">
-            <button [disabled]="!valid || !changed" color="primary" mat-flat-button>
+            <button (click)="save()" [disabled]="!valid || !changed" color="primary" mat-flat-button>
                 {{ 'edit-color-dialog.save' | translate }}
             </button>
         </div>