1 files changed, 10 insertions, 1 deletions

diff --git a/client/src/com/vaadin/client/widgets/Grid.java b/client/src/com/vaadin/client/widgets/Grid.java
index a77499e41f..c25f2e5942 100644
--- a/client/src/com/vaadin/client/widgets/Grid.java
+++ b/client/src/com/vaadin/client/widgets/Grid.java
@@ -1321,6 +1321,7 @@ public class Grid<T> extends ResizeComposite implements
                 if (state == State.SAVING) {
                     cleanup();
                     cancel();
+                    grid.clearSortOrder();
                 }
             }
 
@@ -7612,6 +7613,14 @@ public class Grid<T> extends ResizeComposite implements
         setSortOrder(order, false);
     }
 
+    /**
+     * Clears the sort order and indicators without re-sorting.
+     */
+    private void clearSortOrder() {
+        sortOrder.clear();
+        refreshHeader();
+    }
+
     private void setSortOrder(List<SortOrder> order, boolean userOriginated) {
         if (order != sortOrder) {
             sortOrder.clear();
@@ -8697,4 +8706,4 @@ public class Grid<T> extends ResizeComposite implements
         }
         return null;
     }
-}
\ No newline at end of file
+}