diff --git a/tine20/Tinebase/js/widgets/grid/GridPanel.js b/tine20/Tinebase/js/widgets/grid/GridPanel.js
index 6e20311086..49f5881690 100644
--- a/tine20/Tinebase/js/widgets/grid/GridPanel.js
+++ b/tine20/Tinebase/js/widgets/grid/GridPanel.js
@@ -1228,6 +1228,10 @@ Ext.extend(Tine.widgets.grid.GridPanel, Ext.Panel, {
             return;
         }
 
+        if (this.editDialog) {
+            this.storeRemoteSort = false;
+        }
+        
         if (this.recordProxy) {
             if (! this.defaultSortInfo.field) {
                 if (this.modelConfig && this.modelConfig.defaultSortInfo) {