diff --git a/ui/app/components/secure-variable-form.hbs b/ui/app/components/secure-variable-form.hbs
index 6d2868b4b..55bb34859 100644
--- a/ui/app/components/secure-variable-form.hbs
+++ b/ui/app/components/secure-variable-form.hbs
@@ -1,4 +1,6 @@
-<form class="new-secure-variables" autocomplete="off" {{on "submit" this.save}}>
+<form class="new-secure-variables" autocomplete="off" {{on "submit" this.save}}
+  {{did-insert this.appendItemIfEditing}}
+>
   {{!-- TODO: {{if this.parseError 'is-danger'}} on inputs --}}
   <div>
     <label>
diff --git a/ui/app/components/secure-variable-form.js b/ui/app/components/secure-variable-form.js
index 5826a259b..84ebf3ae3 100644
--- a/ui/app/components/secure-variable-form.js
+++ b/ui/app/components/secure-variable-form.js
@@ -26,7 +26,7 @@ export default class SecureVariableFormComponent extends Component {
     return !this.args.model?.path;
   }
 
-  @tracked keyValues = copy(this.args.model?.keyValues)?.map((kv) => {
+  @tracked keyValues = copy(this.args.model?.keyValues || [])?.map((kv) => {
     return {
       key: kv.key,
       value: kv.value,
@@ -109,4 +109,14 @@ export default class SecureVariableFormComponent extends Component {
       });
     }
   }
+
+  /**
+   * Appends a row to the end of the Items list if you're editing an existing variable.
+   * This will allow it to auto-focus and make all other rows deletable
+   */
+  @action appendItemIfEditing() {
+    if (!this.args.model?.isNew) {
+      this.appendRow();
+    }
+  }
 }