diff --git a/app/models/build.js b/app/models/build.js
index 57a96ec9..6855ed95 100644
--- a/app/models/build.js
+++ b/app/models/build.js
@@ -120,7 +120,7 @@ Build.reopen({
 
   canCancel: function() {
     return this.get('jobs').filterBy('canCancel').length;
-  }.property('jobs.@each.canCancel'),
+  }.property('jobs.@each.canCancel', 'jobs', 'jobs.[]'),
 
   canRestart: Ember.computed.alias('isFinished'),
 
diff --git a/app/models/job.js b/app/models/job.js
index f2284e5f..8d421622 100644
--- a/app/models/job.js
+++ b/app/models/job.js
@@ -106,7 +106,7 @@ export default Model.extend(DurationCalculations, {
 
   canCancel: function() {
     return !this.get('isFinished');
-  }.property('state'),
+  }.property('isFinished'),
 
   canRestart: Ember.computed.alias('isFinished'),