diff --git a/templates/projects/new.tmpl b/templates/projects/new.tmpl
index e7927221a8..ecb8c74565 100644
--- a/templates/projects/new.tmpl
+++ b/templates/projects/new.tmpl
@@ -38,7 +38,7 @@
 							<input type="hidden" name="board_type" value="{{.type}}">
 							<div class="default text">{{.locale.Tr "repo.projects.template.desc_helper"}}</div>
 							<div class="menu">
-								{{range $element := .ProjectTypes}}
+								{{range $element := .BoardTypes}}
 									<div class="item" data-id="{{$element.BoardType}}" data-value="{{$element.BoardType}}">{{$.locale.Tr $element.Translation}}</div>
 								{{end}}
 							</div>
diff --git a/templates/repo/projects/new.tmpl b/templates/repo/projects/new.tmpl
index 20c4d2ebfc..4778279317 100644
--- a/templates/repo/projects/new.tmpl
+++ b/templates/repo/projects/new.tmpl
@@ -54,7 +54,7 @@
 					<div class="ui selection dropdown">
 						{{svg "octicon-triangle-down" 14 "dropdown icon"}}
 						{{range $element := .CardTypes}}
-							{{if or (eq $.card_type $element.CardType) (and (not $.card_type) (eq $element.CardType 2))}}
+							{{if or (eq $.card_type $element.CardType) (and (not $.PageIsEditProjects) (eq $element.CardType 1))}}
 								<input type="hidden" name="card_type" value="{{$element.CardType}}">
 								<div class="default text">{{$.locale.Tr $element.Translation}}</div>
 							{{end}}