diff --git a/apps/red-ui/src/app/modules/dossier-overview/components/file-attribute/file-attribute.component.html b/apps/red-ui/src/app/modules/dossier-overview/components/file-attribute/file-attribute.component.html
index 28cb398fb..d2d92bff8 100644
--- a/apps/red-ui/src/app/modules/dossier-overview/components/file-attribute/file-attribute.component.html
+++ b/apps/red-ui/src/app/modules/dossier-overview/components/file-attribute/file-attribute.component.html
@@ -1,5 +1,10 @@
 <ng-container *ngIf="configService.listingMode$ | async as mode">
-    <div (click)="editFileAttribute($event)" [ngClass]="{ 'workflow-attribute': mode === 'workflow' }" class="file-attribute">
+    <div
+        (mousedown)="handleClick($event)"
+        (click)="editFileAttribute($event)"
+        [ngClass]="{ 'workflow-attribute': mode === 'workflow' }"
+        class="file-attribute"
+    >
         <div [ngClass]="{ 'workflow-value': mode === 'workflow' }" class="value">
             <b *ngIf="mode === 'workflow' && !isInEditMode"> {{ fileAttribute.label }}: </b>
             <span
diff --git a/apps/red-ui/src/app/modules/dossier-overview/components/file-attribute/file-attribute.component.ts b/apps/red-ui/src/app/modules/dossier-overview/components/file-attribute/file-attribute.component.ts
index c853cafb8..67b29b6d2 100644
--- a/apps/red-ui/src/app/modules/dossier-overview/components/file-attribute/file-attribute.component.ts
+++ b/apps/red-ui/src/app/modules/dossier-overview/components/file-attribute/file-attribute.component.ts
@@ -78,6 +78,10 @@ export class FileAttributeComponent extends BaseFormComponent implements OnDestr
         }
     }
 
+    handleClick($event: MouseEvent) {
+        $event.stopPropagation();
+    }
+
     ngOnDestroy() {
         this.#subscriptions.unsubscribe();
     }
@@ -157,7 +161,10 @@ export class FileAttributeComponent extends BaseFormComponent implements OnDestr
         });
         return this._formBuilder.group(config, {
             validators: control =>
-                !control.get(this.fileAttribute.id).value?.trim().length && !this.fileAttributeValue ? { emptyString: true } : null,
+                (!control.get(this.fileAttribute.id)?.value?.trim().length && !this.fileAttributeValue) ||
+                control.get(this.fileAttribute.id)?.value === this.fileAttributeValue
+                    ? { emptyString: true }
+                    : null,
         });
     }