diff --git a/app/pods/protected/strains/show/measurements-table-row/component.js b/app/pods/protected/strains/show/measurements-table-row/component.js
index 252e6e3..39216ec 100644
--- a/app/pods/protected/strains/show/measurements-table-row/component.js
+++ b/app/pods/protected/strains/show/measurements-table-row/component.js
@@ -4,6 +4,16 @@ export default Ember.Component.extend({
   tagName: 'tr',
   isEditing: false,
 
+  oldCharacteristicId: function() {
+    let json = this.get('row').toJSON();
+    return json.characteristic;
+  }.property(),
+
+  rowChanged: Ember.computed('row.notes', 'row.value', 'row.characteristic.id', function() {
+    return this.get('row.hasDirtyAttributes') ||
+      this.get('oldCharacteristicId') !== this.get('row.characteristic.id');
+  }),
+
   actions: {
     edit: function() {
       // The parent table fetches all of the characteristics ahead of time
@@ -13,8 +23,10 @@ export default Ember.Component.extend({
 
     save: function() {
       this.toggleProperty('isEditing');
-      this.get('row').save();
+      if (this.get('rowChanged')) {
+        this.get('row').save();
+      }
     },
-    
+
   },
 });
diff --git a/app/pods/protected/strains/show/measurements-table-row/template.hbs b/app/pods/protected/strains/show/measurements-table-row/template.hbs
index bdf8566..fd0bf3d 100644
--- a/app/pods/protected/strains/show/measurements-table-row/template.hbs
+++ b/app/pods/protected/strains/show/measurements-table-row/template.hbs
@@ -16,9 +16,15 @@
   </td>
   {{#if canEdit}}
     <td>
+      {{#if rowChanged}}
       <button class="button-red smaller" {{action 'save'}}>
         Save
       </button>
+      {{else}}
+      <button class="button-gray smaller" {{action 'save'}}>
+        Cancel
+      </button>
+      {{/if}}
     </td>
   {{/if}}
 {{else}}