diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml
index b21874c..b64e085 100644
--- a/app/views/projects/issues/show.html.haml
+++ b/app/views/projects/issues/show.html.haml
@@ -33,8 +33,8 @@
   %span.milestone-nav-link
     - if @issue.milestone
       |
+      %span.light Milestone
       = link_to project_milestone_path(@project, @issue.milestone) do
-        %span.light Milestone
         = @issue.milestone.title
 
 .issue-box
diff --git a/app/views/projects/issues/update.js.haml b/app/views/projects/issues/update.js.haml
index 2be1d0f..7e26cb7 100644
--- a/app/views/projects/issues/update.js.haml
+++ b/app/views/projects/issues/update.js.haml
@@ -8,6 +8,6 @@
   $('.chosen').chosen();
   $('.edit-issue.inline-update input[type="submit"]').hide();
   - if @issue.milestone
-    $('.milestone-nav-link').replaceWith("#{escape_javascript(link_to "| #{@issue.milestone.title}", project_milestone_path(@issue.project, @issue.milestone), :class => 'milestone-nav-link')}")
+    $('.milestone-nav-link').replaceWith("<span class='milestone-nav-link'>| <span class='light'>Milestone</span> #{escape_javascript(link_to @issue.milestone.title, project_milestone_path(@issue.project, @issue.milestone))}</span>")
   - else
     $('.milestone-nav-link').html('')
--
libgit2 0.21.2