diff --git a/layerindex/views.py b/layerindex/views.py
index fc46da0..1499651 100644
--- a/layerindex/views.py
+++ b/layerindex/views.py
@@ -235,7 +235,9 @@ class LayerDetailView(DetailView):
         context = super(LayerDetailView, self).get_context_data(**kwargs)
         layer = context['layeritem']
         context['useredit'] = layer.user_can_edit(self.user)
-        context['layerbranch'] = layer.get_layerbranch(self.request.session.get('branch', 'master'))
+        layerbranch = layer.get_layerbranch(self.request.session.get('branch', 'master'))
+        context['layerbranch'] = layerbranch
+        context['machines'] = layerbranch.machine_set.order_by('name')
         return context
 
 class LayerReviewDetailView(LayerDetailView):
diff --git a/templates/layerindex/detail.html b/templates/layerindex/detail.html
index 668f440..a1ebae4 100644
--- a/templates/layerindex/detail.html
+++ b/templates/layerindex/detail.html
@@ -150,7 +150,7 @@
             </div>  <!-- end of row-fluid -->
         </div> <!-- end of container-fluid -->
 
-        {% if layerbranch.machine_set.count > 0 %}
+        {% if machines.count > 0 %}
         <div class="container-fluid" style="margin-bottom:1em;">
             <div class="row-fluid">
                 <div class="navbar">
@@ -161,7 +161,7 @@
 
                 <table class="table table-bordered">
                     <tbody>
-                        {% for machine in layerbranch.machine_set.all %}
+                        {% for machine in machines %}
                             <tr>
                                 <td><a href="{{ machine.vcs_web_url }}">{{ machine.name }}</a></td>
                                 <td>{{ machine.description }}</td>