1 files changed, 5 insertions, 0 deletions
diff --git a/server/src/com/vaadin/ui/Grid.java b/server/src/com/vaadin/ui/Grid.java
index af89064411..251ec0f678 100644
--- a/server/src/com/vaadin/ui/Grid.java
+++ b/server/src/com/vaadin/ui/Grid.java
@@ -6084,10 +6084,15 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
         editorActive = false;
         editorFieldGroup.discard();
         editorFieldGroup.setItemDataSource(null);
+
         if (datasource instanceof ItemSetChangeNotifier) {
             ((ItemSetChangeNotifier) datasource)
                     .removeItemSetChangeListener(editorClosingItemSetListener);
         }
+
+        // Mark Grid as dirty so the client side gets to know that the editors
+        // are no longer attached
+        markAsDirty();
     }
 
     void resetEditor() {