diff --git a/assets/scripts/app/models/repo.coffee b/assets/scripts/app/models/repo.coffee
index 6b22908e..2e662a50 100644
--- a/assets/scripts/app/models/repo.coffee
+++ b/assets/scripts/app/models/repo.coffee
@@ -12,6 +12,14 @@ require 'travis/model'
 
   lastBuild: DS.belongsTo('Travis.Build')
 
+  lastBuildHash: (->
+    {
+      id: @get('lastBuildId')
+      number: @get('lastBuildNumber')
+      repo: this
+    }
+  ).property('lastBuildId', 'lastBuildNumber')
+
   allBuilds: (->
     allBuilds = DS.RecordArray.create
       type: Travis.Build
diff --git a/assets/scripts/app/templates/repos/list.hbs b/assets/scripts/app/templates/repos/list.hbs
index 1cebc6f5..1a1eca71 100644
--- a/assets/scripts/app/templates/repos/list.hbs
+++ b/assets/scripts/app/templates/repos/list.hbs
@@ -13,9 +13,11 @@
           <a {{action showRepo this href=true}} class="slug">{{slug}}</a>
         {{/if}}
       </div>
-      {{#if lastBuildId}}
-        <a {{action showBuild this lastBuildId href=true}} class="last_build">{{lastBuildNumber}}</a>
-      {{/if}}
+      {{#with lastBuildHash}}
+        {{#if id}}
+          <a {{action showBuild repo id href=true}} class="last_build">{{number}}</a>
+        {{/if}}
+      {{/with}}
 
       <p class="summary">
         <span class="duration_label">{{t repositories.duration}}:</span>