diff --git a/modules/claim/front/basic-data/index.html b/modules/claim/front/basic-data/index.html
index d2338bcc3..eb3c3b9e3 100644
--- a/modules/claim/front/basic-data/index.html
+++ b/modules/claim/front/basic-data/index.html
@@ -62,9 +62,14 @@
         </vn-horizontal>
     </vn-card>
     <vn-button-bar>
-        <vn-submit label="Save"></vn-submit>
-        <vn-button label="Undo changes" 
-            ng-if="$ctrl.$.form.$dirty" 
+        <vn-submit
+            disabled="!watcher.dataChanged()"
+            label="Save">
+        </vn-submit>
+        <vn-button
+            class="cancel"
+            label="Undo changes"
+            disabled="!watcher.dataChanged()"
             ng-click="watcher.loadOriginalData()">
         </vn-button>
     </vn-button-bar>
diff --git a/modules/claim/front/development/index.html b/modules/claim/front/development/index.html
index 3a78e6374..f274104b0 100644
--- a/modules/claim/front/development/index.html
+++ b/modules/claim/front/development/index.html
@@ -105,9 +105,17 @@
         </vn-vertical>
     </vn-card>
     <vn-button-bar>
-        <vn-submit 
-            label="Save" 
-            ng-click="$ctrl.onSubmit()">
+        <vn-submit
+            disabled="!watcher.dataChanged()"
+            ng-click="$ctrl.onSubmit()"
+            label="Save">
         </vn-submit>
+        <!-- # #2680 Undo changes button bugs -->
+        <!-- <vn-button
+            class="cancel"
+            label="Undo changes"
+            disabled="!watcher.dataChanged()"
+            ng-click="watcher.loadOriginalData()">
+        </vn-button> -->
     </vn-button-bar>
 </vn-vertical>
\ No newline at end of file