diff --git a/src/main/webapp/templates/_tags.html b/src/main/webapp/templates/_tags.html
index ee33a6bc..61f674bf 100644
--- a/src/main/webapp/templates/_tags.html
+++ b/src/main/webapp/templates/_tags.html
@@ -7,6 +7,6 @@
 		<span class="label label-info" ng-repeat="tag in entry.tags">{{tag}}</span>
 	</span>
 	<span ng-if="edit_mode">
-		<input type="text" ui-select2="select2Options" ng-model="entry.tags" class="tag-input" />
+		<input type="text" ui-select2="select2Options" ng-model="entry.tags" class="tag-input" autofocus />
 	</span>
 </span>
\ No newline at end of file