1 files changed, 10 insertions, 0 deletions
diff --git a/server/src/com/vaadin/ui/Grid.java b/server/src/com/vaadin/ui/Grid.java
index cad02a6ea6..84867f87d7 100644
--- a/server/src/com/vaadin/ui/Grid.java
+++ b/server/src/com/vaadin/ui/Grid.java
@@ -532,6 +532,16 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
                 return super.getPropertyType(propertyId);
             }
         }
+
+        @Override
+        protected <T extends Field> T build(String caption, Class<?> dataType,
+                Class<T> fieldType) throws BindException {
+            T field = super.build(caption, dataType, fieldType);
+            if (field instanceof CheckBox) {
+                field.setCaption(null);
+            }
+            return field;
+        }
     }
 
     /**