diff --git a/src/app/userstory-form/userstory-form.component.html b/src/app/userstory-form/userstory-form.component.html
index 7701d59..1d86b8b 100644
--- a/src/app/userstory-form/userstory-form.component.html
+++ b/src/app/userstory-form/userstory-form.component.html
@@ -13,8 +13,8 @@
                     <div class="col-md-9">
                         <div class="form-group">
                             <label for="Title">Titel</label>
-                            <input type="text" class="form-control" id="Title" required name="title"
-                                [(ngModel)]="userstory.title">
+                            <input type="text" class="form-control" id="Title" required autofocus name="title"
+                                [(ngModel)]="userstory.title" id="titleField">
                         </div>
                     </div>
                     <div class="col-md-1"></div>
diff --git a/src/app/userstory-form/userstory-form.component.ts b/src/app/userstory-form/userstory-form.component.ts
index 0312338..8ff39bb 100644
--- a/src/app/userstory-form/userstory-form.component.ts
+++ b/src/app/userstory-form/userstory-form.component.ts
@@ -20,6 +20,7 @@ export class UserstoryFormComponent implements OnInit {
 		} else {
 			this.editing = true;
 		}
+		this.focusTitleField();
 	}
 
 	onSubmit() {
@@ -41,4 +42,8 @@ export class UserstoryFormComponent implements OnInit {
 	onClose() {
 		this.activeModalService.dismiss(this.userstory);
 	}
+
+	focusTitleField() {
+		document.getElementById('titleField').focus();
+	}
 }