diff --git a/modules/item/front/barcode/index.html b/modules/item/front/barcode/index.html
index ade4c2f7d..3815115d8 100644
--- a/modules/item/front/barcode/index.html
+++ b/modules/item/front/barcode/index.html
@@ -42,6 +42,9 @@
         </vn-one>
     </vn-card>
     <vn-button-bar>
-        <vn-submit label="Save"></vn-submit>
+        <vn-submit
+            ng-if="watcher.dataChanged()"
+            label="Save">
+        </vn-submit>
     </vn-button-bar>
 </form>
diff --git a/modules/item/front/basic-data/index.html b/modules/item/front/basic-data/index.html
index 0a40328b1..586b6eaba 100644
--- a/modules/item/front/basic-data/index.html
+++ b/modules/item/front/basic-data/index.html
@@ -158,8 +158,11 @@
         </vn-horizontal>
     </vn-card>
     <vn-button-bar>
-            <vn-submit label="Save"></vn-submit>
-            <vn-button label="Undo changes" ng-if="$ctrl.$scope.form.$dirty" ng-click="watcher.loadOriginalData()"></vn-button>
+        <vn-submit
+            ng-if="watcher.dataChanged()"
+            label="Save">
+        </vn-submit>
+        <vn-button label="Undo changes" ng-if="$ctrl.$scope.form.$dirty" ng-click="watcher.loadOriginalData()"></vn-button>
     </vn-button-bar>
 </form>
 
diff --git a/modules/item/front/botanical/index.html b/modules/item/front/botanical/index.html
index 135a55e6f..283132baa 100644
--- a/modules/item/front/botanical/index.html
+++ b/modules/item/front/botanical/index.html
@@ -45,7 +45,10 @@
         </vn-horizontal>
     </vn-card>
     <vn-button-bar>
-        <vn-submit label="Save"></vn-submit>
+        <vn-submit
+            ng-if="watcher.dataChanged()"
+            label="Save">
+        </vn-submit>
         <vn-button
             ng-if="watcher.dataChanged()"
             label="Undo changes"
diff --git a/modules/item/front/create/index.html b/modules/item/front/create/index.html
index 1756852c9..a0a788a1c 100644
--- a/modules/item/front/create/index.html
+++ b/modules/item/front/create/index.html
@@ -61,6 +61,7 @@
     </vn-card>
     <vn-button-bar>
         <vn-submit
+            ng-if="watcher.dataChanged()"
             label="Create">
         </vn-submit>
         <vn-button
diff --git a/modules/item/front/niche/index.html b/modules/item/front/niche/index.html
index cb616a409..c40b4f6f3 100644
--- a/modules/item/front/niche/index.html
+++ b/modules/item/front/niche/index.html
@@ -57,6 +57,9 @@
         </vn-one>
     </vn-card>
     <vn-button-bar>
-        <vn-submit label="Save"></vn-submit>
+        <vn-submit
+            ng-if="watcher.dataChanged()"
+            label="Save">
+        </vn-submit>
     </vn-button-bar>
 </form>
\ No newline at end of file
diff --git a/modules/item/front/tags/index.html b/modules/item/front/tags/index.html
index d773e8ee4..b03c4bdc4 100644
--- a/modules/item/front/tags/index.html
+++ b/modules/item/front/tags/index.html
@@ -73,6 +73,9 @@
         </vn-one>
     </vn-card>
     <vn-button-bar>
-        <vn-submit label="Save"></vn-submit>
+        <vn-submit
+            ng-if="watcher.dataChanged()"
+            label="Save">
+        </vn-submit>
     </vn-button-bar>
 </form>
\ No newline at end of file
diff --git a/modules/item/front/tax/index.html b/modules/item/front/tax/index.html
index 39feaa13d..0abb70f28 100644
--- a/modules/item/front/tax/index.html
+++ b/modules/item/front/tax/index.html
@@ -28,7 +28,15 @@
         </vn-horizontal>
     </vn-card>
     <vn-button-bar>
-        <vn-submit label="Save"></vn-submit>
-        <vn-button label="Undo changes" ng-if="watcher.dataChanged()" ng-click="watcher.loadOriginalData()"></vn-button>
+        <vn-submit
+            ng-if="watcher.dataChanged()"
+            label="Save">
+        </vn-submit>
+        <!-- # #2680 Undo changes button bugs -->
+        <!-- <vn-button
+            label="Undo changes"
+            ng-if="watcher.dataChanged()"
+            ng-click="watcher.loadOriginalData()">
+        </vn-button> -->
     </vn-button-bar>
 </form>
\ No newline at end of file