diff --git a/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/PartServiceImpl.java b/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/PartServiceImpl.java
index 2f66337..1d66f30 100644
--- a/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/PartServiceImpl.java
+++ b/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/PartServiceImpl.java
@@ -83,9 +83,17 @@
 						&& getParts().contains(selectedPart)) {
 					MPlaceholder placeholder = selectedPart.getCurSharedRef();
 					// ask the renderer to create this part
-					engine.createGui(placeholder == null ? selectedPart : placeholder);
-					firePartVisible(selectedPart);
-					firePartBroughtToTop(selectedPart);
+					if (placeholder == null) {
+						if (selectedPart.getParent().getRenderer() != null) {
+							engine.createGui(selectedPart);
+							firePartVisible(selectedPart);
+							firePartBroughtToTop(selectedPart);
+						}
+					} else if (placeholder.getParent().getRenderer() != null) {
+						engine.createGui(placeholder);
+						firePartVisible(selectedPart);
+						firePartBroughtToTop(selectedPart);
+					}
 				}
 			}
 		}
diff --git a/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/application/HeadlessContextPresentationEngine.java b/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/application/HeadlessContextPresentationEngine.java
index a0228bc..0d43138 100644
--- a/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/application/HeadlessContextPresentationEngine.java
+++ b/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/application/HeadlessContextPresentationEngine.java
@@ -304,6 +304,7 @@
 				placeholders.add(placeholder);
 			}
 		}
+		element.setRenderer(this);
 		return null;
 	}