3 files changed, 9 insertions, 4 deletions
diff --git a/server/src/com/vaadin/ui/components/grid/Grid.java b/server/src/com/vaadin/ui/components/grid/Grid.java
index 7544f2b497..503ef0a1c4 100644
--- a/server/src/com/vaadin/ui/components/grid/Grid.java
+++ b/server/src/com/vaadin/ui/components/grid/Grid.java
@@ -16,6 +16,7 @@
 
 package com.vaadin.ui.components.grid;
 
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -46,9 +47,9 @@ import com.vaadin.shared.ui.grid.GridClientRpc;
 import com.vaadin.shared.ui.grid.GridColumnState;
 import com.vaadin.shared.ui.grid.GridServerRpc;
 import com.vaadin.shared.ui.grid.GridState;
+import com.vaadin.shared.ui.grid.HeightMode;
 import com.vaadin.shared.ui.grid.Range;
 import com.vaadin.shared.ui.grid.ScrollDestination;
-import com.vaadin.shared.ui.grid.HeightMode;
 import com.vaadin.ui.AbstractComponent;
 import com.vaadin.ui.Component;
 
@@ -86,7 +87,7 @@ public class Grid extends AbstractComponent {
      * Component hierarchy.
      * </ul>
      */
-    private final class ActiveRowHandler {
+    private final class ActiveRowHandler implements Serializable {
         /**
          * A map from itemId to the value change listener used for all of its
          * properties
diff --git a/shared/src/com/vaadin/shared/ui/grid/GridConstants.java b/shared/src/com/vaadin/shared/ui/grid/GridConstants.java
index 5b88fad5a8..d5fdd40120 100644
--- a/shared/src/com/vaadin/shared/ui/grid/GridConstants.java
+++ b/shared/src/com/vaadin/shared/ui/grid/GridConstants.java
@@ -15,6 +15,8 @@
  */
 package com.vaadin.shared.ui.grid;
 
+import java.io.Serializable;
+
 /**
  * Container class for common constants and default values used by the Grid
  * component.
@@ -22,7 +24,7 @@ package com.vaadin.shared.ui.grid;
  * @since 7.2
  * @author Vaadin Ltd
  */
-public final class GridConstants {
+public final class GridConstants implements Serializable {
 
     /**
      * Default padding in pixels when scrolling programmatically, without an
diff --git a/shared/src/com/vaadin/shared/ui/grid/Range.java b/shared/src/com/vaadin/shared/ui/grid/Range.java
index 3114a79c82..2593f7afd9 100644
--- a/shared/src/com/vaadin/shared/ui/grid/Range.java
+++ b/shared/src/com/vaadin/shared/ui/grid/Range.java
@@ -16,6 +16,8 @@
 
 package com.vaadin.shared.ui.grid;
 
+import java.io.Serializable;
+
 /**
  * An immutable representation of a range, marked by start and end points.
  * <p>
@@ -28,7 +30,7 @@ package com.vaadin.shared.ui.grid;
  * @since 7.2
  * @author Vaadin Ltd
  */
-public final class Range {
+public final class Range implements Serializable {
     private final int start;
     private final int end;