diff --git a/src/root/build.tt b/src/root/build.tt
index d716630b..f6a5313d 100644
--- a/src/root/build.tt
+++ b/src/root/build.tt
@@ -400,7 +400,7 @@ FOR step IN steps; IF step.busy; busy = 1; END; END;
         <tbody>
           [% FOREACH metric IN build.buildmetrics %]
             <tr>
-              <td><tt><a class="row-link" href="[% c.uri_for('/job' project.name jobset.name job.name 'metric' metric.name) %]">[%HTML.escape(metric.name)%]</a></tt></td>
+              <td><tt><a class="row-link" [% HTML.attributes(href => c.uri_for('/job' project.name jobset.name job.name 'metric' metric.name)) %]">[%HTML.escape(metric.name)%]</a></tt></td>
               <td style="text-align: right">[%metric.value%]</td>
               <td>[%metric.unit%]</td>
             </tr>
diff --git a/src/root/job-metrics-tab.tt b/src/root/job-metrics-tab.tt
index 2aaa652c..163046b7 100644
--- a/src/root/job-metrics-tab.tt
+++ b/src/root/job-metrics-tab.tt
@@ -16,7 +16,7 @@
 
   [% FOREACH metric IN metrics %]
 
-    <h3>Metric: <tt>[%HTML.escape(metric.name)%]</tt></h3>
+    <h3>Metric: <a [% HTML.attributes(href => c.uri_for('/job' project.name jobset.name job.name 'metric' metric.name)) %]><tt>[%HTML.escape(metric.name)%]</tt></a></h3>
 
     [% id = "metric-" _ metric.name;
        id = id.replace('\.', '_');