diff --git a/templates/repo/issue/fields/markdowneditor.tmpl b/templates/repo/issue/fields/markdowneditor.tmpl
index 85b1f00a4c178..3c8bea1327ed7 100644
--- a/templates/repo/issue/fields/markdowneditor.tmpl
+++ b/templates/repo/issue/fields/markdowneditor.tmpl
@@ -1,4 +1,4 @@
 <div class="field">
 	{{template "repo/issue/fields/header" .}}
-	{{template "repo/issue/comment_tab" $}}
+	{{template "repo/issue/comment_tab" .Context.Data}}
 </div>
diff --git a/templates/repo/issue/new_form.tmpl b/templates/repo/issue/new_form.tmpl
index f603fd92a47e1..4e1980902723b 100644
--- a/templates/repo/issue/new_form.tmpl
+++ b/templates/repo/issue/new_form.tmpl
@@ -30,7 +30,7 @@
 							{{else if eq .Type "checkboxes"}}
 								{{template "repo/issue/fields/checkboxes" dict "Context" $.Context "item" .}}
 							{{else if eq .Type "markdowneditor"}}
-								{{template "repo/issue/fields/markdowneditor" dict "Context" $.Context "item" $}}
+								{{template "repo/issue/fields/markdowneditor" dict "Context" $.Context "item" .}}
 							{{end}}
 						{{end}}
 						{{if .IsAttachmentEnabled}}