diff --git a/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-configurations-dialog/file-attributes-configurations-dialog.component.html b/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-configurations-dialog/file-attributes-configurations-dialog.component.html
index baea014f3..649fc9030 100644
--- a/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-configurations-dialog/file-attributes-configurations-dialog.component.html
+++ b/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-configurations-dialog/file-attributes-configurations-dialog.component.html
@@ -19,11 +19,11 @@
                     />
                 </div>
                 <div class="iqser-input-group required w-110">
-                    <label translate="file-attributes-configurations.form.delimitator"></label>
+                    <label translate="file-attributes-configurations.form.delimiter"></label>
                     <input
-                        [placeholder]="'file-attributes-configurations.form.delimitator' | translate"
-                        formControlName="delimitator"
-                        name="delimitator"
+                        [placeholder]="'file-attributes-configurations.form.delimiter' | translate"
+                        formControlName="delimiter"
+                        name="delimiter"
                         type="text"
                     />
                 </div>
@@ -45,4 +45,6 @@
             <div class="all-caps-label cancel" translate="file-attributes-configurations.cancel"></div>
         </div>
     </form>
+
+    <iqser-circle-button class="dialog-close" icon="iqser:close" mat-dialog-close></iqser-circle-button>
 </section>
diff --git a/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-configurations-dialog/file-attributes-configurations-dialog.component.ts b/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-configurations-dialog/file-attributes-configurations-dialog.component.ts
index e570e5a7e..6ab62a162 100644
--- a/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-configurations-dialog/file-attributes-configurations-dialog.component.ts
+++ b/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-configurations-dialog/file-attributes-configurations-dialog.component.ts
@@ -1,7 +1,7 @@
-import { ChangeDetectionStrategy, Component } from '@angular/core';
-import { MatDialogRef } from '@angular/material/dialog';
+import { ChangeDetectionStrategy, Component, Inject } from '@angular/core';
+import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import { FormBuilder, FormGroup } from '@angular/forms';
-import { FileAttributeEncodingTypes } from '../../../../../../../../libs/red-domain/src';
+import { FileAttributeEncodingTypes, IFileAttributesConfig } from '../../../../../../../../libs/red-domain/src';
 import { fileAttributeEncodingTypesTranslations } from '../../translations/file-attribute-encoding-types-translations';
 
 @Component({
@@ -10,11 +10,17 @@ import { fileAttributeEncodingTypesTranslations } from '../../translations/file-
     changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class FileAttributesConfigurationsDialogComponent {
+    private readonly _configuration: IFileAttributesConfig = this._data;
+
     readonly form: FormGroup;
     readonly encodingTypeOptions = Object.keys(FileAttributeEncodingTypes);
     readonly translations = fileAttributeEncodingTypesTranslations;
 
-    constructor(private readonly _formBuilder: FormBuilder, readonly dialogRef: MatDialogRef<FileAttributesConfigurationsDialogComponent>) {
+    constructor(
+        private readonly _formBuilder: FormBuilder,
+        readonly dialogRef: MatDialogRef<FileAttributesConfigurationsDialogComponent>,
+        @Inject(MAT_DIALOG_DATA) private _data: IFileAttributesConfig,
+    ) {
         this.form = this._getForm();
     }
 
@@ -22,9 +28,9 @@ export class FileAttributesConfigurationsDialogComponent {
 
     private _getForm(): FormGroup {
         return this._formBuilder.group({
-            supportCsvMapping: [false],
+            supportCsvMapping: [!!this._configuration.filenameMappingColumnHeaderName],
             keyColumn: [''],
-            delimitator: [''],
+            delimiter: [this._configuration.delimiter],
             encodingType: [FileAttributeEncodingTypes.UTF8],
         });
     }
diff --git a/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.ts
index 897f9095a..3d8d08064 100644
--- a/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.ts
+++ b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.ts
@@ -88,7 +88,7 @@ export class FileAttributesListingScreenComponent extends ListingComponent<FileA
     }
 
     openConfigurationsDialog($event: MouseEvent) {
-        this._dialogService.openDialog('fileAttributesConfigurations', $event, null);
+        this._dialogService.openDialog('fileAttributesConfigurations', $event, this._existingConfiguration);
     }
 
     openConfirmDeleteAttributeDialog($event: MouseEvent, fileAttribute?: IFileAttributeConfig) {
diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json
index c9928ae4f..f3f85be72 100644
--- a/apps/red-ui/src/assets/i18n/en.json
+++ b/apps/red-ui/src/assets/i18n/en.json
@@ -952,7 +952,7 @@
   "file-attributes-configurations": {
     "cancel": "Cancel",
     "form": {
-      "delimitator": "Delimitator",
+      "delimiter": "Delimiter",
       "encoding-type": "Encoding Type",
       "key-column": "Key Column",
       "support-csv-mapping": "Support CSV Mapping"