diff --git a/puppetboard/app.py b/puppetboard/app.py
index 0fbf684..14689c7 100644
--- a/puppetboard/app.py
+++ b/puppetboard/app.py
@@ -202,9 +202,9 @@ def metrics():
   metrics = puppetdb._query('metrics', path='mbeans')
   for key,value in metrics.iteritems():
     metrics[key]=value.split('/')[3]
-  return render_template('metrics.html', metrics=metrics)
+  return render_template('metrics.html', metrics=sorted(metrics.items()))
 
 @app.route('/metric/<metric>')
 def metric(metric):
   metric = puppetdb.metric(metric)
-  return render_template('metric.html', metric=metric)
+  return render_template('metric.html', metric=sorted(metric.items()))
diff --git a/puppetboard/templates/metric.html b/puppetboard/templates/metric.html
index 8e2aba6..17f60cf 100644
--- a/puppetboard/templates/metric.html
+++ b/puppetboard/templates/metric.html
@@ -3,7 +3,7 @@
 <h1>Metric</h1>
 <table class="table table-striped">
   <tbody>
-    {% for key,value in metric.iteritems() %}
+    {% for key,value in metric %}
     <tr>
       <td>{{key}}</td>
       <td>{{value}}</td>
diff --git a/puppetboard/templates/metrics.html b/puppetboard/templates/metrics.html
index 8f84658..cf90e13 100644
--- a/puppetboard/templates/metrics.html
+++ b/puppetboard/templates/metrics.html
@@ -2,7 +2,7 @@
 {% block content %}
 <h1>Metrics</h1>
 <ul>
-  {% for key,value in metrics.iteritems() %}
+  {% for key,value in metrics %}
   <li><a href="{{url_for('metric', metric=value)}}">{{key}}</li>
   {% endfor %}
 </ul>