1 files changed, 3 insertions, 0 deletions
diff --git a/client/src/com/vaadin/client/ui/layout/VLayoutSlot.java b/client/src/com/vaadin/client/ui/layout/VLayoutSlot.java
index 509499a5f9..125f135aee 100644
--- a/client/src/com/vaadin/client/ui/layout/VLayoutSlot.java
+++ b/client/src/com/vaadin/client/ui/layout/VLayoutSlot.java
@@ -90,6 +90,9 @@ public abstract class VLayoutSlot {
             captionAboveCompnent = !caption.shouldBePlacedAfterComponent();
             if (!captionAboveCompnent) {
                 availableWidth -= captionWidth;
+                if (availableWidth < 0) {
+                    availableWidth = 0;
+                }
                 captionStyle.clearLeft();
                 captionStyle.setRight(0, Unit.PX);
                 style.setPaddingRight(captionWidth, Unit.PX);