diff --git a/src/app/modules/shared/components/details-fields/details-fields.component.html b/src/app/modules/shared/components/details-fields/details-fields.component.html
index c0dcea89d..6feaf50ec 100644
--- a/src/app/modules/shared/components/details-fields/details-fields.component.html
+++ b/src/app/modules/shared/components/details-fields/details-fields.component.html
@@ -117,6 +117,7 @@
             class="form-control"
             aria-label="Small"
             aria-describedby="inputGroup-sizing-sm"
+            [disabled]="true"
             [class.is-invalid]="end_date.invalid && end_date.touched"
             required
             [max]="getCurrentDate()"
diff --git a/src/app/modules/shared/components/details-fields/details-fields.component.ts b/src/app/modules/shared/components/details-fields/details-fields.component.ts
index 3b277b755..7a9831042 100644
--- a/src/app/modules/shared/components/details-fields/details-fields.component.ts
+++ b/src/app/modules/shared/components/details-fields/details-fields.component.ts
@@ -383,6 +383,7 @@ export class DetailsFieldsComponent implements OnChanges, OnInit {
         end_date: formatDate(get(this.entryToEdit, 'start_date', ''), DATE_FORMAT, 'en'),
         end_hour: formatDate(new Date(), 'HH:mm', 'en'),
       });
+      this.end_date.setValue(this.start_date.value);
     }
     this.shouldRestartEntry = !this.entryToEdit?.running && this.goingToWorkOnThis;
   }