diff --git a/admin/post-types/shop_order.php b/admin/post-types/shop_order.php
index d0a365f393d..9c0d57bb037 100644
--- a/admin/post-types/shop_order.php
+++ b/admin/post-types/shop_order.php
@@ -7,6 +7,19 @@
  * @package 	WooCommerce
  */
  
+/**
+ * Disable auto-save
+ **/
+add_action('admin_print_scripts', 'woocommerce_disable_autosave_for_orders');
+
+function woocommerce_disable_autosave_for_orders(){
+    global $post;
+    
+    if($post && get_post_type($post->ID) === 'shop_order'){
+        wp_dequeue_script('autosave');
+    }
+}
+
 /**
  * Columns for order page
  **/