1 files changed, 6 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 f308d07673..bc0c6739bb 100644
--- a/client/src/com/vaadin/client/ui/layout/VLayoutSlot.java
+++ b/client/src/com/vaadin/client/ui/layout/VLayoutSlot.java
@@ -149,6 +149,8 @@ public abstract class VLayoutSlot {
             if (captionAboveCompnent) {
                 captionStyle.setLeft(0, Unit.PX);
             }
+            // Reset left when changing back to align left
+            widget.getElement().getStyle().clearLeft();
         }
 
     }
@@ -212,6 +214,10 @@ public abstract class VLayoutSlot {
             padding += captionHeight;
 
             widget.getElement().getStyle().setTop(padding, Unit.PX);
+        } else {
+            // Reset top when changing back to align top
+            widget.getElement().getStyle().clearTop();
+
         }
     }