diff --git a/apps/red-ui/src/app/modules/dossier-overview/components/file-attribute/file-attribute.component.scss b/apps/red-ui/src/app/modules/dossier-overview/components/file-attribute/file-attribute.component.scss
index a4410d2b2..a4ebe2b8b 100644
--- a/apps/red-ui/src/app/modules/dossier-overview/components/file-attribute/file-attribute.component.scss
+++ b/apps/red-ui/src/app/modules/dossier-overview/components/file-attribute/file-attribute.component.scss
@@ -87,6 +87,10 @@
 
             iqser-dynamic-input {
                 margin-top: 0;
+
+                ::ng-deep mat-datepicker-toggle {
+                    bottom: -4px;
+                }
             }
 
             .workflow-input {
@@ -106,6 +110,10 @@
                         font-size: 12px;
                         padding-left: 5px;
                     }
+
+                    mat-datepicker-toggle {
+                        bottom: -12px;
+                    }
                 }
             }
 
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 e5753584e..8e03a8976 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
@@ -79,7 +79,7 @@ export class FileAttributeComponent extends BaseFormComponent implements OnDestr
     @Debounce(50)
     @HostListener('document:click')
     clickOutside() {
-        if (this.isInEditMode && this.closedDatepicker) {
+        if (this.isInEditMode && !this.closedDatepicker) {
             this.close();
         }
     }
@@ -157,7 +157,7 @@ export class FileAttributeComponent extends BaseFormComponent implements OnDestr
         });
         return this._formBuilder.group(config, {
             validators: control =>
-                (!control.get(this.fileAttribute.id)?.value?.trim().length && !this.fileAttributeValue) ||
+                (!this.isDate && !control.get(this.fileAttribute.id)?.value?.trim().length && !this.fileAttributeValue) ||
                 control.get(this.fileAttribute.id)?.value === this.fileAttributeValue
                     ? { emptyString: true }
                     : null,