diff --git a/plugins/org.eclipse.eef.common.ui/src/org/eclipse/eef/common/ui/api/EEFWidgetFactory.java b/plugins/org.eclipse.eef.common.ui/src/org/eclipse/eef/common/ui/api/EEFWidgetFactory.java
index f571650..e051efc 100644
--- a/plugins/org.eclipse.eef.common.ui/src/org/eclipse/eef/common/ui/api/EEFWidgetFactory.java
+++ b/plugins/org.eclipse.eef.common.ui/src/org/eclipse/eef/common/ui/api/EEFWidgetFactory.java
@@ -31,6 +31,7 @@
 import org.eclipse.ui.forms.widgets.FormToolkit;
 import org.eclipse.ui.forms.widgets.Hyperlink;
 import org.eclipse.ui.forms.widgets.Section;
+import org.eclipse.ui.internal.forms.widgets.FormUtil;
 
 /**
  * A FormToolkit customized for use by tabbed property sheet page and others.
@@ -141,6 +142,7 @@
 	 */
 	public ScrolledComposite createScrolledComposite(Composite parent, int style) {
 		ScrolledComposite scrolledComposite = new ScrolledComposite(parent, style);
+		FormUtil.setFocusScrollingEnabled(scrolledComposite, false);
 		return scrolledComposite;
 	}
 
diff --git a/plugins/org.eclipse.eef.properties.ui/src/org/eclipse/eef/properties/ui/internal/page/EEFTabbedPropertyComposite.java b/plugins/org.eclipse.eef.properties.ui/src/org/eclipse/eef/properties/ui/internal/page/EEFTabbedPropertyComposite.java
index 250e2a6..c1b2610 100644
--- a/plugins/org.eclipse.eef.properties.ui/src/org/eclipse/eef/properties/ui/internal/page/EEFTabbedPropertyComposite.java
+++ b/plugins/org.eclipse.eef.properties.ui/src/org/eclipse/eef/properties/ui/internal/page/EEFTabbedPropertyComposite.java
@@ -96,7 +96,7 @@
 		this.leftComposite = this.widgetFactory.createComposite(this.mainComposite, SWT.NO_FOCUS);
 		this.leftComposite.setLayout(new FormLayout());
 
-		this.scrolledComposite = new ScrolledComposite(this.mainComposite, SWT.H_SCROLL | SWT.V_SCROLL | SWT.NO_FOCUS);
+		this.scrolledComposite = this.widgetFactory.createScrolledComposite(this.mainComposite, SWT.H_SCROLL | SWT.V_SCROLL | SWT.NO_FOCUS);
 		FormData formData = new FormData();
 		formData.left = new FormAttachment(this.leftComposite, 0);
 		formData.right = new FormAttachment(100, 0);