diff --git a/assets/scripts/app/controllers/running_jobs.coffee b/assets/scripts/app/controllers/running_jobs.coffee
index 11534d9d..71778532 100644
--- a/assets/scripts/app/controllers/running_jobs.coffee
+++ b/assets/scripts/app/controllers/running_jobs.coffee
@@ -39,7 +39,9 @@ Travis.RunningJobsController = Em.ArrayProxy.extend
   init: ->
     @_super.apply this, arguments
 
-    @addedJobs @get('content') if @get('content')
+    jobs = Travis.Job.running()
+    @set 'content', jobs
+    @addedJobs jobs
 
   contentArrayWillChange: (array, index, removedCount, addedCount) ->
     @_super.apply this, arguments
diff --git a/assets/scripts/app/templates/jobs/running/group.hbs b/assets/scripts/app/templates/jobs/running/group.hbs
index dd249448..f7c1b793 100644
--- a/assets/scripts/app/templates/jobs/running/group.hbs
+++ b/assets/scripts/app/templates/jobs/running/group.hbs
@@ -5,9 +5,9 @@
 <ul class="jobs">
   {{#each job in sortedJobs}}
     <li class="job">
-      <a {{action showJob job.repoData job target="Travis.app.router" href=true}}>
+      {{#linkTo "job" job.repoData job}}
         #{{job.number}}
-      </a>
+      {{/linkTo}}
     </li>
   {{/each}}
 </ul>
diff --git a/assets/scripts/app/views/sidebar.coffee b/assets/scripts/app/views/sidebar.coffee
index 9c6518fe..a6d98c6a 100644
--- a/assets/scripts/app/views/sidebar.coffee
+++ b/assets/scripts/app/views/sidebar.coffee
@@ -39,7 +39,6 @@
       templateName: 'queues/list'
       init: ->
         @_super.apply this, arguments
-
         @set 'controller', @get('controller').container.lookup('controller:queues')
 
       showAll: (event) ->
@@ -49,14 +48,13 @@
     RunningJobsView: Em.View.extend
       templateName: 'jobs/running'
       elementId: 'running-jobs'
-      controller: Travis.RunningJobsController.create()
+      init: ->
+        @_super.apply this, arguments
+        @set 'controller', @get('controller').container.lookup('controller:runningJobs')
 
       groupsBinding: 'controller.sortedGroups'
       jobsBinding: 'controller'
 
-      didInsertElement: ->
-        @get('controller').set 'content', Travis.Job.running()
-
       GroupView: Em.View.extend
         templateName: 'jobs/running/group'
         tagName: 'li'