diff --git a/templates/repo/issue/comment_tab.tmpl b/templates/repo/issue/comment_tab.tmpl
index b04a3c6bbb..b8e8d2d9aa 100644
--- a/templates/repo/issue/comment_tab.tmpl
+++ b/templates/repo/issue/comment_tab.tmpl
@@ -1,19 +1,3 @@
-{{if .Fields}}
-	<input type="hidden" name="template-file" value="{{.TemplateFile}}">
-	{{range .Fields}}
-		{{if eq .Type "input"}}
-			{{template "repo/issue/fields/input" Dict "Context" $.Context "item" .}}
-		{{else if eq .Type "markdown"}}
-			{{template "repo/issue/fields/markdown" Dict "Context" $.Context "item" .}}
-		{{else if eq .Type "textarea"}}
-			{{template "repo/issue/fields/textarea" Dict "Context" $.Context "item" .}}
-		{{else if eq .Type "dropdown"}}
-			{{template "repo/issue/fields/dropdown" Dict "Context" $.Context "item" .}}
-		{{else if eq .Type "checkboxes"}}
-			{{template "repo/issue/fields/checkboxes" Dict "Context" $.Context "item" .}}
-		{{end}}
-	{{end}}
-{{else}}
 	<div class="ui top tabular menu" data-write="write" data-preview="preview">
 		<a class="active item" data-tab="write">{{.locale.Tr "write"}}</a>
 		<a class="item" data-tab="preview" data-url="{{.Repository.Link}}/markdown" data-context="{{.RepoLink}}">{{.locale.Tr "preview"}}</a>
@@ -28,7 +12,6 @@
 			{{.locale.Tr "loading"}}
 		</div>
 	</div>
-{{end}}
 {{if .IsAttachmentEnabled}}
 	<div class="field">
 		{{template "repo/upload" .}}
diff --git a/templates/repo/issue/new_form.tmpl b/templates/repo/issue/new_form.tmpl
index 4945203ca5..f6ef8e6754 100644
--- a/templates/repo/issue/new_form.tmpl
+++ b/templates/repo/issue/new_form.tmpl
@@ -16,7 +16,29 @@
 							<div class="title_wip_desc" data-wip-prefixes="{{Json .PullRequestWorkInProgressPrefixes}}">{{.locale.Tr "repo.pulls.title_wip_desc" (index .PullRequestWorkInProgressPrefixes 0| Escape) | Safe}}</div>
 						{{end}}
 					</div>
-					{{template "repo/issue/comment_tab" .}}
+					{{if .Fields}}
+						<input type="hidden" name="template-file" value="{{.TemplateFile}}">
+						{{range .Fields}}
+							{{if eq .Type "input"}}
+								{{template "repo/issue/fields/input" Dict "Context" $.Context "item" .}}
+							{{else if eq .Type "markdown"}}
+								{{template "repo/issue/fields/markdown" Dict "Context" $.Context "item" .}}
+							{{else if eq .Type "textarea"}}
+								{{template "repo/issue/fields/textarea" Dict "Context" $.Context "item" .}}
+							{{else if eq .Type "dropdown"}}
+								{{template "repo/issue/fields/dropdown" Dict "Context" $.Context "item" .}}
+							{{else if eq .Type "checkboxes"}}
+								{{template "repo/issue/fields/checkboxes" Dict "Context" $.Context "item" .}}
+							{{end}}
+						{{end}}
+						{{if .IsAttachmentEnabled}}
+						<div class="field">
+							{{template "repo/upload" .}}
+						</div>
+						{{end}}
+					{{else}}
+						{{template "repo/issue/comment_tab" .}}
+					{{end}}
 					<div class="text right">
 						<button class="ui green button loading-button" tabindex="6">
 							{{if .PageIsComparePull}}