diff --git a/CHANGELOG b/CHANGELOG
index c9ca59bb40..6d6a896491 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,4 @@
+* Restore tab default order when no manual change
 * Add support for column sorting
 * Manage confirm attribute on buttons
 * Call autocompletion when setting record value
diff --git a/src/screen.js b/src/screen.js
index bd483f175e..d94862be63 100644
--- a/src/screen.js
+++ b/src/screen.js
@@ -627,7 +627,7 @@
             this.size_limit = null;
             this.limit = attributes.limit || Sao.config.limit;
             this.offset = 0;
-            this.order = attributes.order;
+            this.order = this.default_order = attributes.order;
             var access = Sao.common.MODELACCESS.get(model_name);
             if (!(access.write || access.create)) {
                 this.attributes.readonly = true;
diff --git a/src/view/tree.js b/src/view/tree.js
index aec1f2a1f8..1781ec3f37 100644
--- a/src/view/tree.js
+++ b/src/view/tree.js
@@ -223,7 +223,7 @@
                     }
                 }
             });
-            this.screen.order = null;
+            this.screen.order = this.screen.default_order;
             if (arrow.hasClass(arrow_bottom)) {
                 arrow.removeClass(arrow_bottom);
                 arrow.addClass(arrow_top);