diff --git a/app/views/shipit/stacks/show.html.erb b/app/views/shipit/stacks/show.html.erb
index 35035830b..2c8f774ba 100644
--- a/app/views/shipit/stacks/show.html.erb
+++ b/app/views/shipit/stacks/show.html.erb
@@ -36,7 +36,7 @@
         <h2>Previous Deploys</h2>
       </header>
       <ul class="commit-list">
-        <%= render partial: 'shipit/tasks/task', collection: @tasks %>
+        <%= render partial: @tasks %>
       </ul>
     </section>
   <% end %>
diff --git a/test/controllers/stacks_controller_test.rb b/test/controllers/stacks_controller_test.rb
index 5e68f557c..29a32ade9 100644
--- a/test/controllers/stacks_controller_test.rb
+++ b/test/controllers/stacks_controller_test.rb
@@ -83,6 +83,15 @@ class StacksControllerTest < ActionController::TestCase
       assert_response :ok
     end
 
+    test "#show links deploys, rollbacks, and tasks to their own pages" do
+      get :show, params: { id: @stack.to_param }
+
+      assert_response :ok
+      assert_select ".commit-list a[href='#{stack_deploy_path(@stack, shipit_tasks(:shipit))}']"
+      assert_select ".commit-list a[href='#{stack_deploy_path(@stack, shipit_tasks(:shipit_rollback))}']"
+      assert_select ".commit-list a[href='#{stack_task_path(@stack, shipit_tasks(:shipit_restart))}']"
+    end
+
     test "#show with faulty and validating deploys is success" do
       get :show, params: { id: shipit_stacks(:shipit_canaries).to_param }
       assert_response :ok