diff --git a/assets/scripts/app/templates/repos/list.hbs b/assets/scripts/app/templates/repos/list.hbs
index 48f54a87..378891fc 100644
--- a/assets/scripts/app/templates/repos/list.hbs
+++ b/assets/scripts/app/templates/repos/list.hbs
@@ -7,32 +7,30 @@
 <div class="tab">
   {{#if isLoaded}}
     {{#collection Travis.ReposListView contentBinding="this"}}
-      {{#linkTo "repo" this}}
-        {{#with view.repo}}
-          <div class="slug-and-status">
-            <span class="status"></span>
-            {{#if slug}}
-              {{#linkTo "repo" this class="slug"}}{{slug}}{{/linkTo}}
-            {{/if}}
-          </div>
-          {{#with lastBuildHash}}
-            {{#if repo.slug}}
-              {{#linkTo "build" repo id class="last_build"}}{{number}}{{/linkTo}}
-            {{/if}}
-          {{/with}}
-
-          <p class="summary">
-            <span class="duration-icon"></span><span class="duration_label">{{t repositories.duration}}:</span>
-            <abbr class="duration" {{bindAttr title="lastBuildStartedAt"}}>{{formatDuration lastBuildDuration}}</abbr>
-          </p>
-          <p class="summary">
-            <span class="finished-icon"></span><span class="finished_at_label">{{t repositories.finished_at}}:</span>
-            <abbr class="finished_at timeago" {{bindAttr title="lastBuildFinishedAt"}}>{{formatTime lastBuildFinishedAt}}</abbr>
-          </p>
-
-          <div class="indicator"><span></span></div>
+      {{#with view.repo}}
+        <div class="slug-and-status">
+          <span class="status"></span>
+          {{#if slug}}
+            {{#linkTo "repo" this class="slug"}}{{slug}}{{/linkTo}}
+          {{/if}}
+        </div>
+        {{#with lastBuildHash}}
+          {{#if repo.slug}}
+            {{#linkTo "build" repo id class="last_build"}}{{number}}{{/linkTo}}
+          {{/if}}
         {{/with}}
-      {{/linkTo}}
+
+        <p class="summary">
+          <span class="duration-icon"></span><span class="duration_label">{{t repositories.duration}}:</span>
+          <abbr class="duration" {{bindAttr title="lastBuildStartedAt"}}>{{formatDuration lastBuildDuration}}</abbr>
+        </p>
+        <p class="summary">
+          <span class="finished-icon"></span><span class="finished_at_label">{{t repositories.finished_at}}:</span>
+          <abbr class="finished_at timeago" {{bindAttr title="lastBuildFinishedAt"}}>{{formatTime lastBuildFinishedAt}}</abbr>
+        </p>
+
+        <div class="indicator"><span></span></div>
+      {{/with}}
     {{else}}
       <p class="empty">{{noReposMessage}}</p>
     {{/collection}}