diff --git a/src/main/twirl/gitbucket/core/issues/issue.scala.html b/src/main/twirl/gitbucket/core/issues/issue.scala.html
index 0cec84d..885a58b 100644
--- a/src/main/twirl/gitbucket/core/issues/issue.scala.html
+++ b/src/main/twirl/gitbucket/core/issues/issue.scala.html
@@ -65,6 +65,7 @@
   $('#edit').click(function(){
     $('.edit-title').show();
     $('.show-title').hide();
+    $('#edit-title').focus();
     return false;
   });
 
diff --git a/src/main/twirl/gitbucket/core/pulls/menu.scala.html b/src/main/twirl/gitbucket/core/pulls/menu.scala.html
index 7381e58..88271d9 100644
--- a/src/main/twirl/gitbucket/core/pulls/menu.scala.html
+++ b/src/main/twirl/gitbucket/core/pulls/menu.scala.html
@@ -91,6 +91,7 @@
    $('#edit').click(function(){
       $('.edit-title').show();
       $('.show-title').hide();
+      $('#edit-title').focus();
       return false;
     });