diff --git a/com.codeaffine.eclipse.swt/src/com/codeaffine/eclipse/swt/widget/scrollable/CompositeScrollableLayouter.java b/com.codeaffine.eclipse.swt/src/com/codeaffine/eclipse/swt/widget/scrollable/CompositeScrollableLayouter.java
index e26b04bf..425f7134 100644
--- a/com.codeaffine.eclipse.swt/src/com/codeaffine/eclipse/swt/widget/scrollable/CompositeScrollableLayouter.java
+++ b/com.codeaffine.eclipse.swt/src/com/codeaffine/eclipse/swt/widget/scrollable/CompositeScrollableLayouter.java
@@ -47,8 +47,11 @@ private static int computeHeight( AdaptionContext<?> context ) {
   }
 
   private static int computeHeightWithHorizontalBarPadding( AdaptionContext<?> context ) {
-    int horizontalBarHeight = context.getScrollable().getHorizontalBarSize().y;
-    return context.getVisibleArea().height - BAR_BREADTH + horizontalBarHeight;
+    if( context.getScrollable().getHorizontalBarVisible() ) {
+      int horizontalBarHeight = context.getScrollable().getHorizontalBarSize().y;
+      return context.getVisibleArea().height - BAR_BREADTH + horizontalBarHeight;
+    }
+    return context.getVisibleArea().height - BAR_BREADTH;
   }
 
   private static int computeWidth( AdaptionContext<?> context ) {