diff --git a/src/main/twirl/issues/create.scala.html b/src/main/twirl/issues/create.scala.html
index 7b92e2c..b82884c 100644
--- a/src/main/twirl/issues/create.scala.html
+++ b/src/main/twirl/issues/create.scala.html
@@ -33,7 +33,7 @@
                 <input type="hidden" name="milestoneId" value=""/>
                 @helper.html.dropdown() {
                   <li><a href="javascript:void(0);" class="milestone" data-id=""><i class="icon-remove-circle"></i> No milestone</a></li>
-                  @milestones.map { milestone =>
+                  @milestones.filter(_.closedDate.isEmpty).map { milestone =>
                     <li>
                       <a href="javascript:void(0);" class="milestone" data-id="@milestone.milestoneId" data-title="@milestone.title">
                         <i class="icon-while"></i> @milestone.title
diff --git a/src/main/twirl/issues/issuedetail.scala.html b/src/main/twirl/issues/issuedetail.scala.html
index 7a61819..df678d1 100644
--- a/src/main/twirl/issues/issuedetail.scala.html
+++ b/src/main/twirl/issues/issuedetail.scala.html
@@ -54,7 +54,7 @@
         @if(hasWritePermission){
           @helper.html.dropdown() {
             <li><a href="javascript:void(0);" class="milestone" data-id=""><i class="icon-remove-circle"></i> No milestone</a></li>
-            @milestones.map { case (milestone, _, _) =>
+            @milestones.filter(_._1.closedDate.isEmpty).map { case (milestone, _, _) =>
               <li>
                 <a href="javascript:void(0);" class="milestone" data-id="@milestone.milestoneId" data-title="@milestone.title">
                   @helper.html.checkicon(Some(milestone.milestoneId) == issue.milestoneId) @milestone.title