diff --git a/modules/order/front/basic-data/index.html b/modules/order/front/basic-data/index.html
index 9dc7973e75..7ad73e1be0 100644
--- a/modules/order/front/basic-data/index.html
+++ b/modules/order/front/basic-data/index.html
@@ -67,12 +67,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/order/front/create/index.html b/modules/order/front/create/index.html
index 11de7ff6cb..86df579a61 100644
--- a/modules/order/front/create/index.html
+++ b/modules/order/front/create/index.html
@@ -3,7 +3,14 @@
         <vn-order-create-card vn-id="card" on-save=""></vn-order-create-card>
     </vn-card>
     <vn-button-bar>
-        <vn-submit ng-click="$ctrl.onSubmit()" label="Create">   
+        <vn-submit
+            ng-click="$ctrl.onSubmit()"
+            label="Create">
         </vn-submit>
+        <vn-button
+            class="cancel"
+            label="Cancel"
+            ui-sref="order.index">
+        </vn-button>
     </vn-button-bar>
 </div>
\ No newline at end of file