diff --git a/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/workbench/ui/renderers/swt/WBPartFactory.java b/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/workbench/ui/renderers/swt/WBPartFactory.java
index 5286c90..8a79b8a 100644
--- a/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/workbench/ui/renderers/swt/WBPartFactory.java
+++ b/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/workbench/ui/renderers/swt/WBPartFactory.java
@@ -65,6 +65,9 @@
 			parentContext.set(IServiceConstants.ACTIVE_CHILD, localContext);
 			localContext.set(MWindow.class.getName(), part);
 
+			// Add the shell into the WBW's context
+			localContext.set(Shell.class.getName(), wbwShell);
+
 			if (part instanceof MWorkbenchWindow) {
 				TrimmedLayout tl = new TrimmedLayout(wbwShell);
 				wbwShell.setLayout(tl);