diff --git a/src/main/java/com/flowingcode/vaadin/addons/twincolgrid/TwinColGrid.java b/src/main/java/com/flowingcode/vaadin/addons/twincolgrid/TwinColGrid.java
index 06f613d..69ddff1 100644
--- a/src/main/java/com/flowingcode/vaadin/addons/twincolgrid/TwinColGrid.java
+++ b/src/main/java/com/flowingcode/vaadin/addons/twincolgrid/TwinColGrid.java
@@ -160,6 +160,8 @@ public TwinColGrid(final ListDataProvider<T> dataProvider, String caption) {
 		rightVL.setPadding(false);
 		rightVL.setSpacing(false);
 		HorizontalLayout hl = new HorizontalLayout(leftVL, buttonContainer, rightVL);
+		hl.getElement().getStyle().set("min-height", "0px");
+		hl.getElement().getStyle().set("flex", "1 1 0px");
 		hl.setMargin(false);
 		hl.setWidthFull();
 		add(hl);