diff --git a/assets/scripts/app/templates/repos/show/actions.hbs b/assets/scripts/app/templates/repos/show/actions.hbs
index de829fab..5f1232fd 100644
--- a/assets/scripts/app/templates/repos/show/actions.hbs
+++ b/assets/scripts/app/templates/repos/show/actions.hbs
@@ -32,13 +32,17 @@
         {{/if}}
       </li>
     {{/if}}
-    {{!TODO: for some reason showDownloadLog, which just delegates to jobIdForLog
-             does not refresh 'if' properly, need further investigation}}
-    {{#if view.jobIdForLog}}
+    {{#if view.showDownloadLog}}
       <li class="icon download-log" title="Download Log">
         <a class="download-log" {{bind-attr href="view.plainTextLogUrl"}}></a>
       </li>
     {{/if}}
+    {{#if view.displayRemoveLog}}
+      <li class="icon remove-log" title="Remove Log">
+        <a href="#" {{action "removeLog" target="view"}}
+          {{bind-attr class="view.canRemoveLog::disabled"}}></a>
+      </li>
+    {{/if}}
     {{#if view.displayCodeClimate}}
       <li class="icon code-climate" title="Test Coverage with Code Climate">
         <a href="#" name="code-climate"
diff --git a/assets/scripts/app/views/repo/show.coffee b/assets/scripts/app/views/repo/show.coffee
index 7b81c188..d1779239 100644
--- a/assets/scripts/app/views/repo/show.coffee
+++ b/assets/scripts/app/views/repo/show.coffee
@@ -260,7 +260,7 @@ Travis.reopen
 
     jobIdForLog: (->
       @get('job.id') ||
-        (@get('build.jobs.length') == 1 && @get('build.jobs.firstObject.id'))
+        (@get('build.jobs.length') == 1 && @get('build.jobs').objectAt(0).get?('id'))
     ).property('job.id', 'build.jobs.firstObject.id', 'build.jobs.length')
 
     job: (->
@@ -283,7 +283,8 @@ Travis.reopen
     ).property('displayRemoveLog', 'hasPermission')
 
     displayRemoveLog: (->
-      (@get('isJobTab') || (@get('isBuildTab') && @get('build.jobs.length') == 1)) && @get('build.jobs.firstObject.canRemoveLog')
+      (@get('isJobTab') || (@get('isBuildTab') && @get('build.jobs.length') == 1)) &&
+        @get('build.jobs').objectAt(0).get?('canRemoveLog')
     ).property('isJobTab', 'isBuildTab', 'build.jobs.length', 'job.canRemoveLog')
 
     canCancelBuild: (->