diff --git a/assets/scripts/app/controllers.coffee b/assets/scripts/app/controllers.coffee
index 22f829e4..4b7fcfb5 100644
--- a/assets/scripts/app/controllers.coffee
+++ b/assets/scripts/app/controllers.coffee
@@ -47,7 +47,7 @@ Travis.BuildsItemController = Em.ObjectController.extend(Travis.GithubUrlPropert
   buildBinding: 'content'
 )
 
-Travis.QueuesController = Em.ArrayController.extend
+Travis.QueueController = Em.ArrayController.extend
   content: (->
     Travis.Job.queued()
   ).property()
diff --git a/assets/scripts/app/templates/queue.hbs b/assets/scripts/app/templates/queue.hbs
index f4e47aa9..7229b182 100644
--- a/assets/scripts/app/templates/queue.hbs
+++ b/assets/scripts/app/templates/queue.hbs
@@ -1,10 +1,10 @@
 <ul id="queues">
   <li class="queue">
-    <h4>Queue ({{controller.length}})</h4>
+    <h4>Queue ({{length}})</h4>
     <ul>
-      {{#if controller.length}}
+      {{#if length}}
         {{#each job in controller}}
-          {{#view Travis.QueueItemView jobBinding="job"}}
+          <li>
             {{#if job.repo.slug}}
               {{#link-to "job" job.repo job}}
                 <span class="slug" {{bind-attr title="job.slug"}}>
@@ -13,7 +13,7 @@
                 #{{job.number}}
               {{/link-to}}
             {{/if}}
-          {{/view}}
+          </li>
         {{/each}}
       {{else}}
         There are no jobs
diff --git a/assets/scripts/app/templates/sidebar.hbs b/assets/scripts/app/templates/sidebar.hbs
index a5b89eb0..5496a313 100644
--- a/assets/scripts/app/templates/sidebar.hbs
+++ b/assets/scripts/app/templates/sidebar.hbs
@@ -16,4 +16,4 @@
 
 {{render "runningJobs"}}
 
-{{view Travis.QueueView}}
+{{render "queue"}}
diff --git a/assets/scripts/app/views.coffee b/assets/scripts/app/views.coffee
index 484013c7..8060353c 100644
--- a/assets/scripts/app/views.coffee
+++ b/assets/scripts/app/views.coffee
@@ -23,11 +23,6 @@ Travis.InsufficientOauthPermissionsView = Travis.View.extend
 Travis.FirstSyncView = Travis.View.extend
   layoutName: 'layouts/simple'
 
-Travis.QueueView = Em.View.extend
-  init: ->
-    @_super.apply this, arguments
-    @set 'controller', @get('controller').container.lookup('controller:queues')
-
 require 'views/accounts'
 require 'views/annotation'
 require 'views/application'