diff --git a/src/main/twirl/issues/create.scala.html b/src/main/twirl/issues/create.scala.html
index 009c58d..e325611 100644
--- a/src/main/twirl/issues/create.scala.html
+++ b/src/main/twirl/issues/create.scala.html
@@ -7,7 +7,7 @@
 @import view.helpers._
 @html.main(s"New Issue - ${repository.owner}/${repository.name}", Some(repository)){
   @html.menu("issues", repository){
-    @tab("", repository)
+    @tab("", true, repository)
     <form action="@url(repository)/issues/new" method="POST" validate="true">
     <div class="row-fluid">
       <div class="span9">
diff --git a/src/main/twirl/issues/issue.scala.html b/src/main/twirl/issues/issue.scala.html
index 9cbd6da..a92c541 100644
--- a/src/main/twirl/issues/issue.scala.html
+++ b/src/main/twirl/issues/issue.scala.html
@@ -10,7 +10,7 @@
 @import view.helpers._
 @html.main(s"${issue.title} - Issue #${issue.issueId} - ${repository.owner}/${repository.name}", Some(repository)){
   @html.menu("issues", repository){
-    @tab("issues", repository)
+    @tab("issues", false, repository)
     <ul class="nav nav-tabs pull-left fill-width">
       <li class="pull-left"><a href="@url(repository)/issues"><i class="icon-arrow-left"></i> Back to issue list</a></li>
       <li class="pull-right">Issue #@issue.issueId</li>
diff --git a/src/main/twirl/issues/list.scala.html b/src/main/twirl/issues/list.scala.html
index c05aa92..0e41fba 100644
--- a/src/main/twirl/issues/list.scala.html
+++ b/src/main/twirl/issues/list.scala.html
@@ -17,7 +17,7 @@
 @import view.helpers._
 @html.main(s"Issues - ${repository.owner}/${repository.name}", Some(repository)){
   @html.menu("issues", repository){
-    @tab("issues", repository)
+    @tab("issues", false, repository)
     <div class="row-fluid">
       <div class="span3">
         <ul class="nav nav-pills nav-stacked">
diff --git a/src/main/twirl/issues/milestones/edit.scala.html b/src/main/twirl/issues/milestones/edit.scala.html
index f99f798..bfb3ead 100644
--- a/src/main/twirl/issues/milestones/edit.scala.html
+++ b/src/main/twirl/issues/milestones/edit.scala.html
@@ -3,7 +3,7 @@
 @import view.helpers._
 @html.main(s"Milestones - ${repository.owner}/${repository.name}"){
   @html.menu("milestones", repository){
-    @issues.html.tab("milestones", repository)
+    @issues.html.tab("milestones", false, repository)
     <form method="POST" action="@url(repository)/issues/milestones/@if(milestone.isEmpty){new}else{@milestone.get.milestoneId/edit}" validate="true">
       <fieldset>
         <label for="title"><string>Title</string></label>
diff --git a/src/main/twirl/issues/milestones/list.scala.html b/src/main/twirl/issues/milestones/list.scala.html
index 1c9d9db..0941701 100644
--- a/src/main/twirl/issues/milestones/list.scala.html
+++ b/src/main/twirl/issues/milestones/list.scala.html
@@ -6,7 +6,7 @@
 @import view.helpers._
 @html.main(s"Milestones - ${repository.owner}/${repository.name}"){
   @html.menu("issues", repository){
-    @issues.html.tab("milestones", repository)
+    @issues.html.tab("milestones", false, repository)
     <div class="row-fluid">
       <div class="span3">
         <ul class="nav nav-pills nav-stacked">
diff --git a/src/main/twirl/issues/tab.scala.html b/src/main/twirl/issues/tab.scala.html
index dcb1872..b5cfe32 100644
--- a/src/main/twirl/issues/tab.scala.html
+++ b/src/main/twirl/issues/tab.scala.html
@@ -1,4 +1,4 @@
-@(active: String, repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
+@(active: String, create: Boolean, repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
 @import context._
 @import view.helpers._
 <ul class="nav nav-tabs pull-left fill-width">
@@ -7,7 +7,11 @@
   @if(loginAccount.isDefined){
   <li class="pull-right">
     <div class="btn-group">
-      <a class="btn btn-small btn-success" href="@url(repository)/issues/new">New Issue</a>
+      @if(create){
+        <a class="btn btn-small btn-success" href="#" disabled="disabled">New Issue</a>
+      } else {
+        <a class="btn btn-small btn-success" href="@url(repository)/issues/new">New Issue</a>
+      }
     </div>
   </li>
   }