diff --git a/org.eclipse.draw2d/src/org/eclipse/draw2d/PopUpHelper.java b/org.eclipse.draw2d/src/org/eclipse/draw2d/PopUpHelper.java
index 54e39087d..312a0a0ca 100644
--- a/org.eclipse.draw2d/src/org/eclipse/draw2d/PopUpHelper.java
+++ b/org.eclipse.draw2d/src/org/eclipse/draw2d/PopUpHelper.java
@@ -84,7 +84,7 @@ protected LightweightSystem createLightweightSystem() {
 	 * @since 2.0
 	 */
 	protected Shell createShell() {
-		return new Shell(control.getShell(), shellStyle);
+		return new Shell(control.getDisplay(), shellStyle);
 	}
 
 	/**