diff --git a/UI/Web/src/app/shared/edit-list/edit-list.component.html b/UI/Web/src/app/shared/edit-list/edit-list.component.html
index 0231252d6..ad9de41c9 100644
--- a/UI/Web/src/app/shared/edit-list/edit-list.component.html
+++ b/UI/Web/src/app/shared/edit-list/edit-list.component.html
@@ -1,6 +1,7 @@
 <form [formGroup]="form" *transloco="let t">
   <div formArrayName="items">
-    @for(item of ItemsArray.controls; let i = $index; track i) {
+    <!-- We are tracking items, as the index will not always point towards the same item. -->
+    @for(item of ItemsArray.controls; let i = $index; track item) {
       <div class="row g-0 mb-3">
         <div class="col-lg-10 col-md-12 pe-2">
           <div class="mb-3">
diff --git a/UI/Web/src/app/shared/edit-list/edit-list.component.ts b/UI/Web/src/app/shared/edit-list/edit-list.component.ts
index 6d21549e8..0fc8309f6 100644
--- a/UI/Web/src/app/shared/edit-list/edit-list.component.ts
+++ b/UI/Web/src/app/shared/edit-list/edit-list.component.ts
@@ -69,6 +69,7 @@ export class EditListComponent implements OnInit {
     if (this.ItemsArray.length === 1) {
       this.ItemsArray.at(0).setValue('');
       this.emit();
+      this.cdRef.markForCheck();
       return;
     }