diff --git a/src/app/task-form/task-form.component.html b/src/app/task-form/task-form.component.html
index 4b01472..6bb32ef 100644
--- a/src/app/task-form/task-form.component.html
+++ b/src/app/task-form/task-form.component.html
@@ -22,7 +22,7 @@
                     <div class="form-group">
                         <label for="Title">Titel</label>
                         <input type="text" class="form-control" id="Title" required name="title"
-                            [(ngModel)]="task.title">
+                            [(ngModel)]="task.title" id="titleField">
                     </div>
                 </div>
                 <div class="col-md-1"></div>
diff --git a/src/app/task-form/task-form.component.ts b/src/app/task-form/task-form.component.ts
index 60dd90b..8a9fab7 100644
--- a/src/app/task-form/task-form.component.ts
+++ b/src/app/task-form/task-form.component.ts
@@ -28,6 +28,7 @@ export class TaskFormComponent implements OnInit {
 		} else {
 			this.editing = true;
 		}
+		document.getElementById('titleField').focus();
 	}
 
 	onSubmit() {
diff --git a/src/app/userstory-form/userstory-form.component.html b/src/app/userstory-form/userstory-form.component.html
index 1d86b8b..e23e626 100644
--- a/src/app/userstory-form/userstory-form.component.html
+++ b/src/app/userstory-form/userstory-form.component.html
@@ -13,7 +13,7 @@
                     <div class="col-md-9">
                         <div class="form-group">
                             <label for="Title">Titel</label>
-                            <input type="text" class="form-control" id="Title" required autofocus name="title"
+                            <input type="text" class="form-control" id="Title" required name="title"
                                 [(ngModel)]="userstory.title" id="titleField">
                         </div>
                     </div>