diff --git a/public/js/app.js b/public/js/app.js
index 61539148e9..6208dbedc8 100644
--- a/public/js/app.js
+++ b/public/js/app.js
@@ -770,6 +770,7 @@ function initIssue() {
         $("#issue-edit-btn").on("click", function () {
             $('#issue h1.title,#issue .issue-main > .issue-content .content,#issue-edit-btn').toggleHide();
             $('#issue-edit-title,.issue-edit-content,.issue-edit-cancel,.issue-edit-save').toggleShow();
+            $('#issue-edit-content').focus();
         });
         $('.issue-edit-cancel').on("click", function () {
             $('#issue h1.title,#issue .issue-main > .issue-content .content,#issue-edit-btn').toggleShow();
diff --git a/templates/repo/issue/create.tmpl b/templates/repo/issue/create.tmpl
index ed7ba3559c..de0c47ac20 100644
--- a/templates/repo/issue/create.tmpl
+++ b/templates/repo/issue/create.tmpl
@@ -12,7 +12,7 @@
             </div>
             <div class="col-md-8 panel panel-default">
                 <div class="form-group panel-body">
-                    <input class="form-control input-lg" type="text" name="title" required="required" placeholder="Title" value="{{.title}}" />
+                    <input class="form-control input-lg" type="text" name="title" required="required" placeholder="Title" value="{{.title}}" autofocus />
                 </div>
                 <div class="form-group panel-body">
                     {{if .IsRepositoryOwner}}