diff --git a/web-ui/src/resources/elements/entry-form-group.html b/web-ui/src/resources/elements/entry-form-group.html
index 90b8a48..4c76f3e 100644
--- a/web-ui/src/resources/elements/entry-form-group.html
+++ b/web-ui/src/resources/elements/entry-form-group.html
@@ -3,7 +3,7 @@
         <div class="card-body">
             <h5 class="card-title">${title}</h5>
             <div class="input-group mb-2" repeat.for="entry of entries">
-                <input type="text" class="form-control" placeholder="${title}..." aria-label="${title}..."
+                <input type="text" class="form-control" placeholder="${title}..." aria-label="${title}..." focus.bind="focus($index)"
                     aria-describedby="button-addon2" value.bind="entry" change.delegate="update($index, entry)" maxlength="${maxInputLength}">
                 <div hidden.bind="singleEntry" class="input-group-append">
                     <button class="btn btn-outline-danger" type="button" click.delegate="remove($index, $event)"><i
diff --git a/web-ui/src/resources/elements/entry-form-group.ts b/web-ui/src/resources/elements/entry-form-group.ts
index 67974db..06f4713 100644
--- a/web-ui/src/resources/elements/entry-form-group.ts
+++ b/web-ui/src/resources/elements/entry-form-group.ts
@@ -78,6 +78,10 @@ export class EntryFormGroup {
         this.appService.sendChangeNotification(this.getTypeChanged(), MessageState.Deleted, null, currValue, message);
     }
 
+    focus(index: number) {
+        return index == this.entries.length - 1;
+    }
+
     getTypeChanged() {
         let changedType: TypeChanged;
         switch (this.type) {