diff --git a/templates/question-text.html b/templates/question-text.html
index 42fd2c2..5c4e460 100644
--- a/templates/question-text.html
+++ b/templates/question-text.html
@@ -2,6 +2,6 @@
 
 {% block answer %}
 <fieldset data-role="controlgroup">
-    <input type="text" class="form-control" id="answer" name="answer" value="">
+    <input type="text" class="form-control" id="answer" name="answer" value="" autofocus>
 </fieldset>
 {% end %}
\ No newline at end of file
diff --git a/templates/question-textarea.html b/templates/question-textarea.html
index 82d9f19..1012144 100644
--- a/templates/question-textarea.html
+++ b/templates/question-textarea.html
@@ -2,6 +2,6 @@
 {% autoescape %}
 
 {% block answer %}
-<textarea class="form-control" rows="{{ question['lines'] }}" name="answer"></textarea><br />
+<textarea class="form-control" rows="{{ question['lines'] }}" name="answer" autofocus></textarea><br />
 <input type="hidden" name="question_ref" value="{{ question['ref'] }}">
-{% end %}
\ No newline at end of file
+{% end %}
--
libgit2 0.21.2