diff --git a/modeling/plugins/org.eclipse.pde.emfforms/src/org/eclipse/pde/emfforms/editor/EmfMasterDetailBlock.java b/modeling/plugins/org.eclipse.pde.emfforms/src/org/eclipse/pde/emfforms/editor/EmfMasterDetailBlock.java
index cc7fb4f..4133f65 100644
--- a/modeling/plugins/org.eclipse.pde.emfforms/src/org/eclipse/pde/emfforms/editor/EmfMasterDetailBlock.java
+++ b/modeling/plugins/org.eclipse.pde.emfforms/src/org/eclipse/pde/emfforms/editor/EmfMasterDetailBlock.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Anyware Technologies - initial API and implementation
  *
- * $Id: EmfMasterDetailBlock.java,v 1.18 2009/09/14 09:10:27 bcabe Exp $
+ * $Id: EmfMasterDetailBlock.java,v 1.19 2009/09/24 07:57:10 bcabe Exp $
  */
 package org.eclipse.pde.emfforms.editor;
 
@@ -107,6 +107,9 @@
 		FilteredTree ft = new FilteredTree(client, SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL, new PatternFilter());
 		treeViewer = ft.getViewer();
 
+		// Prevent scrollbars to be managed by the editor's root composite
+		GridDataFactory.fillDefaults().grab(true, true).hint(50, 50).applyTo(treeViewer.getTree());
+
 		//Buttons
 		if (showPushButtons()) {
 			Composite buttonComposite = new Composite(client, SWT.NONE);