diff --git a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dictionary-dialog/edit-dictionary-dialog.component.ts b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dictionary-dialog/edit-dictionary-dialog.component.ts
index 44edff69a..188c45a82 100644
--- a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dictionary-dialog/edit-dictionary-dialog.component.ts
+++ b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dictionary-dialog/edit-dictionary-dialog.component.ts
@@ -1,4 +1,4 @@
-import { Component } from '@angular/core';
+import { Component, HostListener } from '@angular/core';
 import { IconButtonTypes, IqserDialogComponent, LoadingService, Toaster } from '@iqser/common-ui';
 import { FormBuilder } from '@angular/forms';
 import { DictionaryService } from '@services/entity-services/dictionary.service';
@@ -36,6 +36,11 @@ export class EditDictionaryDialogComponent extends IqserDialogComponent<EditDict
         super();
     }
 
+    @HostListener('window:keydown.Escape')
+    closeOnEscape(): void {
+        this.close();
+    }
+
     async save() {
         this._loadingService.start();
         try {
@@ -45,13 +50,14 @@ export class EditDictionaryDialogComponent extends IqserDialogComponent<EditDict
                 this.data.dossierId,
                 this.form.controls.addToDictionaryAction.value,
             );
+            this.close(this.form.value as ReturnType);
         } catch (error) {
             console.error(error);
             this._toaster.error(_('edit-dossier-dialog.dictionary.edit-dialog.error.generic'));
+            this.close();
         }
 
         this._loadingService.stop();
-        this.close(this.form.value as ReturnType);
     }
 
     protected readonly iconButtonTypes = IconButtonTypes;
diff --git a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.html b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.html
index 32956edf3..727bec369 100644
--- a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.html
+++ b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.html
@@ -39,6 +39,7 @@
                             *ngIf="selectedDictionary.dossierDictionaryOnly && selectedDictionary.hasDictionary"
                             (action)="openEditDictionaryModal()"
                             [size]="20"
+                            [tooltip]="'edit-dossier-dialog.dictionary.edit-button-tooltip' | translate"
                             icon="iqser:edit"
                             class="p-left-8"
                         ></iqser-circle-button>
diff --git a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.ts b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.ts
index c0e90fa3c..d517176d8 100644
--- a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.ts
+++ b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.ts
@@ -118,7 +118,9 @@ export class EditDossierDictionaryComponent implements OnInit {
             })
             .result();
 
-        this.selectedDictionary = { ...this.selectedDictionary, addToDictionaryAction: result.addToDictionaryAction } as Dictionary;
+        if (result) {
+            this.selectedDictionary = { ...this.selectedDictionary, addToDictionaryAction: result.addToDictionaryAction } as Dictionary;
+        }
         await this.#retrieveDictionaries();
     }
 
diff --git a/apps/red-ui/src/assets/i18n/redact/de.json b/apps/red-ui/src/assets/i18n/redact/de.json
index e73b6b5f7..443729bd3 100644
--- a/apps/red-ui/src/assets/i18n/redact/de.json
+++ b/apps/red-ui/src/assets/i18n/redact/de.json
@@ -1140,6 +1140,7 @@
     "change-successful": "Dossier wurde aktualisiert.",
     "delete-successful": "Dossier wurde gelöscht.",
     "dictionary": {
+      "edit-button-tooltip": "",
       "edit-dialog": {
         "add-to-dictionary-action": "",
         "cancel": "",
diff --git a/apps/red-ui/src/assets/i18n/redact/en.json b/apps/red-ui/src/assets/i18n/redact/en.json
index 9ba6a5d18..78b5bdbc6 100644
--- a/apps/red-ui/src/assets/i18n/redact/en.json
+++ b/apps/red-ui/src/assets/i18n/redact/en.json
@@ -1140,6 +1140,7 @@
     "change-successful": "Dossier {dossierName} was updated.",
     "delete-successful": "Dossier {dossierName} was deleted.",
     "dictionary": {
+      "edit-button-tooltip": "Edit dossier dictionary settings",
       "edit-dialog": {
         "add-to-dictionary-action": "Available in add/edit dialogs in this dossier",
         "cancel": "Cancel",
diff --git a/apps/red-ui/src/assets/i18n/scm/de.json b/apps/red-ui/src/assets/i18n/scm/de.json
index 22d1033b8..25bbfb82a 100644
--- a/apps/red-ui/src/assets/i18n/scm/de.json
+++ b/apps/red-ui/src/assets/i18n/scm/de.json
@@ -1140,6 +1140,7 @@
     "change-successful": "Dossier wurde aktualisiert.",
     "delete-successful": "Dossier wurde gelöscht.",
     "dictionary": {
+      "edit-button-tooltip": "",
       "edit-dialog": {
         "add-to-dictionary-action": "",
         "cancel": "",
diff --git a/apps/red-ui/src/assets/i18n/scm/en.json b/apps/red-ui/src/assets/i18n/scm/en.json
index b7383dba6..f9f1bffbe 100644
--- a/apps/red-ui/src/assets/i18n/scm/en.json
+++ b/apps/red-ui/src/assets/i18n/scm/en.json
@@ -1140,6 +1140,7 @@
     "change-successful": "Dossier {dossierName} was updated.",
     "delete-successful": "Dossier {dossierName} was deleted.",
     "dictionary": {
+      "edit-button-tooltip": "",
       "edit-dialog": {
         "add-to-dictionary-action": "",
         "cancel": "",