1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VGridLayout.java b/src/com/vaadin/terminal/gwt/client/ui/VGridLayout.java
index 59dd4f9611..d06d6b11a3 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VGridLayout.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VGridLayout.java
@@ -1,4 +1,4 @@
-/* 
+/*
 @ITMillApache2LicenseForJavaFiles@
  */
 
@@ -413,8 +413,10 @@ public class VGridLayout extends SimplePanel implements Paintable, Container {
         int canvasHeight;
         if ("".equals(height)) {
             canvasHeight = y - spacingPixelsVertical;
-        } else {
+        } else if (getOffsetHeight() > marginTopAndBottom) {
             canvasHeight = getOffsetHeight() - marginTopAndBottom;
+        } else {
+            canvasHeight = 0;
         }
         canvas.setHeight(canvasHeight + "px");
     }