diff --git a/templates/repo/issue/comment_tab.tmpl b/templates/repo/issue/comment_tab.tmpl
index a2b5bea27..5ffe1e045 100644
--- a/templates/repo/issue/comment_tab.tmpl
+++ b/templates/repo/issue/comment_tab.tmpl
@@ -4,7 +4,7 @@
     <a class="item" data-tab="preview"  data-url="{{AppSubUrl}}/api/v1/markdown" data-context="{{.RepoLink}}">{{.i18n.Tr "repo.release.preview"}}</a>
   </div>
   <div class="ui bottom attached active tab segment" data-tab="write">
-    <textarea id="content" name="content"></textarea>
+    <textarea id="content" name="content" tabindex="1"></textarea>
   </div>
   <div class="ui bottom attached tab segment markdown" data-tab="preview">
     {{.i18n.Tr "repo.release.loading"}}
diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl
index 7c413fb3e..57aadf8c4 100644
--- a/templates/repo/issue/view_content.tmpl
+++ b/templates/repo/issue/view_content.tmpl
@@ -206,16 +206,16 @@
 			      <div class="text right">
 			      	{{if and .IsIssueOwner (not .DisableStatusChange)}}
 				      	{{if .Issue.IsClosed}}
-								<div id="status-button" class="ui green basic button" data-status="{{.i18n.Tr "repo.issues.reopen_issue"}}" data-status-and-comment="{{.i18n.Tr "repo.issues.reopen_comment_issue"}}" data-status-val="reopen">
+								<button id="status-button" class="ui green basic button" data-status="{{.i18n.Tr "repo.issues.reopen_issue"}}" data-status-and-comment="{{.i18n.Tr "repo.issues.reopen_comment_issue"}}" data-status-val="reopen">
 									{{.i18n.Tr "repo.issues.reopen_issue"}}
-								</div>
+								</button>
 				      	{{else}}
-								<div id="status-button" class="ui red basic button" data-status="{{.i18n.Tr "repo.issues.close_issue"}}" data-status-and-comment="{{.i18n.Tr "repo.issues.close_comment_issue"}}" data-status-val="close">
+								<button id="status-button" tabindex="3" class="ui red basic button" data-status="{{.i18n.Tr "repo.issues.close_issue"}}" data-status-and-comment="{{.i18n.Tr "repo.issues.close_comment_issue"}}" data-status-val="close">
 									{{.i18n.Tr "repo.issues.close_issue"}}
-								</div>
+								</button>
 								{{end}}
 							{{end}}
-							<button class="ui green button">
+							<button class="ui green button" tabindex="2">
 								{{.i18n.Tr "repo.issues.create_comment"}}
 							</button>
 			      </div>