diff --git a/terminus-terminal/src/components/editProfileModal.component.pug b/terminus-terminal/src/components/editProfileModal.component.pug
index c8eb4c49..d89100cf 100644
--- a/terminus-terminal/src/components/editProfileModal.component.pug
+++ b/terminus-terminal/src/components/editProfileModal.component.pug
@@ -17,7 +17,7 @@
     .form-group
         label Arguments
         .input-group(
-            *ngFor='let arg of profile.sessionOptions.args; index as i',
+            *ngFor='let arg of profile.sessionOptions.args; index as i; trackBy: trackByIndex',
         )
             input.form-control(
                 type='text', 
diff --git a/terminus-terminal/src/components/editProfileModal.component.ts b/terminus-terminal/src/components/editProfileModal.component.ts
index 1d98d9f3..8d395c64 100644
--- a/terminus-terminal/src/components/editProfileModal.component.ts
+++ b/terminus-terminal/src/components/editProfileModal.component.ts
@@ -25,4 +25,8 @@ export class EditProfileModalComponent {
     cancel () {
         this.modalInstance.dismiss()
     }
+
+    trackByIndex (index) {
+        return index
+    }
 }