diff --git a/routers/repo/issue.go b/routers/repo/issue.go
index e03f115e2..d54582a2a 100644
--- a/routers/repo/issue.go
+++ b/routers/repo/issue.go
@@ -45,6 +45,7 @@ func CreateIssue(ctx *middleware.Context, params martini.Params, form auth.Creat
 	}
 
 	ctx.Data["Title"] = "Create issue"
+	ctx.Data["IsRepoToolbarIssues"] = true
 
 	if ctx.Req.Method == "GET" {
 		ctx.HTML(200, "issue/create")
diff --git a/templates/issue/create.tmpl b/templates/issue/create.tmpl
new file mode 100644
index 000000000..e71843e6f
--- /dev/null
+++ b/templates/issue/create.tmpl
@@ -0,0 +1,10 @@
+{{template "base/head" .}}
+{{template "base/navbar" .}}
+{{template "repo/nav" .}}
+{{template "repo/toolbar" .}}
+<div id="gogs-body" class="container">
+    <div id="gogs-source">
+        new-issues
+    </div>
+</div>
+{{template "base/footer" .}}
\ No newline at end of file
diff --git a/templates/repo/issues.tmpl b/templates/repo/issues.tmpl
index daacc089c..bf23ff83f 100644
--- a/templates/repo/issues.tmpl
+++ b/templates/repo/issues.tmpl
@@ -4,6 +4,7 @@
 {{template "repo/toolbar" .}}
 <div id="gogs-body" class="container">
     <div id="gogs-source">
+        issues
     </div>
 </div>
 {{template "base/footer" .}}
\ No newline at end of file