diff --git a/modules/entry/front/basic-data/index.html b/modules/entry/front/basic-data/index.html
index b776cb281..4b7661a8f 100644
--- a/modules/entry/front/basic-data/index.html
+++ b/modules/entry/front/basic-data/index.html
@@ -111,12 +111,13 @@
     </vn-card>
     <vn-button-bar>
         <vn-submit
-            ng-if="watcher.dataChanged()"
+            disabled="!watcher.dataChanged()"
             label="Save">
         </vn-submit>
         <vn-button
+            class="cancel"
             label="Undo changes"
-            ng-if="watcher.dataChanged()"
+            disabled="!watcher.dataChanged()"
             ng-click="watcher.loadOriginalData()">
         </vn-button>
     </vn-button-bar>
diff --git a/modules/entry/front/create/index.html b/modules/entry/front/create/index.html
index aa919fe21..ed08b5c76 100644
--- a/modules/entry/front/create/index.html
+++ b/modules/entry/front/create/index.html
@@ -51,12 +51,13 @@
     </vn-card>
     <vn-button-bar>
         <vn-submit
-            ng-if="watcher.dataChanged()"
+            disabled="!watcher.dataChanged()"
             label="Create">
         </vn-submit>
         <vn-button
-            ui-sref="entry.index"
-            label="Cancel">
+            class="cancel"
+            label="Cancel"
+            ui-sref="entry.index"></vn-button>
         </vn-button>
     </vn-button-bar>
 </form>