diff --git a/templates/create_comment.html b/templates/create_comment.html
index 081d8eb..ae0e02e 100644
--- a/templates/create_comment.html
+++ b/templates/create_comment.html
@@ -9,7 +9,7 @@
           </label>
         </div>
         <div>
-          <textarea name="content">
+          <textarea name="content" {{ if .XHR }}autofocus{{ end }}>
           {{- if .Content }}
           {{- .Content -}}
           {{ else if and (eq .Op "edit") .Comments }}