diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/ui/outline/QuickOutlineFragment2.xtend b/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/ui/outline/QuickOutlineFragment2.xtend
new file mode 100644
index 000000000..ffb1bdef5
--- /dev/null
+++ b/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/ui/outline/QuickOutlineFragment2.xtend
@@ -0,0 +1,68 @@
+/*******************************************************************************
+ * Copyright (c) 2015 itemis AG (http://www.itemis.eu) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *******************************************************************************/
+package org.eclipse.xtext.xtext.generator.ui.outline
+
+import com.google.inject.Inject
+import org.eclipse.xtext.xtext.generator.AbstractGeneratorFragment2
+import org.eclipse.xtext.xtext.generator.XtextGeneratorNaming
+
+/**
+ * Contributes the 'Quick Outline' entry to the language editor's context menu. 
+ * 
+ * @author Christian Schneider - Initial contribution and API
+ */
+class QuickOutlineFragment2 extends AbstractGeneratorFragment2 {
+
+	@Inject
+	extension XtextGeneratorNaming
+	
+	override generate() {
+		if (projectConfig.eclipsePluginManifest != null) {
+			projectConfig.eclipsePluginManifest.requiredBundles += "org.eclipse.xtext.ui"
+		}
+		
+		if (projectConfig.eclipsePluginPluginXml != null) {
+			projectConfig.eclipsePluginPluginXml.entries += '''
+				<!-- Quick Outline -->
+				<extension
+					point="org.eclipse.ui.handlers">
+					<handler 
+						class="«grammar.getEclipsePluginExecutableExtensionFactory
+							»:org.eclipse.xtext.ui.editor.outline.quickoutline.ShowQuickOutlineActionHandler"
+						commandId="org.eclipse.xtext.ui.editor.outline.QuickOutline">
+						<activeWhen>
+							<reference
+								definitionId="«grammar.name».Editor.opened">
+							</reference>
+						</activeWhen>
+					</handler>
+				</extension>
+				<extension
+					point="org.eclipse.ui.commands">
+					<command
+						description="Open the quick outline."
+						id="org.eclipse.xtext.ui.editor.outline.QuickOutline"
+						name="Quick Outline">
+					</command>
+				</extension>
+				<extension point="org.eclipse.ui.menus">
+					<menuContribution
+						locationURI="popup:#TextEditorContext?after=group.open">
+						<command commandId="org.eclipse.xtext.ui.editor.outline.QuickOutline"
+							style="push"
+							tooltip="Open Quick Outline">
+							<visibleWhen checkEnabled="false">
+								<reference definitionId="«grammar.name».Editor.opened"/>
+							</visibleWhen>
+						</command>
+					</menuContribution>
+				</extension>
+			'''
+		}
+	}
+}
\ No newline at end of file
diff --git a/plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.xtend b/plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.xtend
index 5de273172..97eebd6c4 100644
--- a/plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.xtend
+++ b/plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.xtend
@@ -291,11 +291,10 @@ class RuntimeProjectDescriptor extends TestedProjectDescriptor {
 							}
 							
 							// outline API
-							fragment = ui.outline.OutlineTreeProviderFragment2 {}
+							fragment = ui.outline.OutlineTreeProviderFragment2 auto-inject {}
 							
-							fragment = adapter.FragmentAdapter {
-								fragment = outline.QuickOutlineFragment auto-inject {}
-							}
+							// quick outline menu contribution
+							fragment = ui.outline.QuickOutlineFragment2 auto-inject {}
 							
 							// quickfix API
 							fragment = adapter.FragmentAdapter {
diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePlugin/org.xtext.example.eclipsePlugin/src/org/xtext/example/mydsl/GenerateMyDsl.mwe2 b/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePlugin/org.xtext.example.eclipsePlugin/src/org/xtext/example/mydsl/GenerateMyDsl.mwe2
index 64c3f6685..dd4b6fff6 100644
--- a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePlugin/org.xtext.example.eclipsePlugin/src/org/xtext/example/mydsl/GenerateMyDsl.mwe2
+++ b/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePlugin/org.xtext.example.eclipsePlugin/src/org/xtext/example/mydsl/GenerateMyDsl.mwe2
@@ -91,11 +91,10 @@ Workflow {
 			}
 			
 			// outline API
-			fragment = ui.outline.OutlineTreeProviderFragment2 {}
+			fragment = ui.outline.OutlineTreeProviderFragment2 auto-inject {}
 			
-			fragment = adapter.FragmentAdapter {
-				fragment = outline.QuickOutlineFragment auto-inject {}
-			}
+			// quick outline menu contribution
+			fragment = ui.outline.QuickOutlineFragment2 auto-inject {}
 			
 			// quickfix API
 			fragment = adapter.FragmentAdapter {
diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full/src/org/xtext/example/mydsl/GenerateMyDsl.mwe2 b/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full/src/org/xtext/example/mydsl/GenerateMyDsl.mwe2
index 64e53bb08..9a778d0ba 100644
--- a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full/src/org/xtext/example/mydsl/GenerateMyDsl.mwe2
+++ b/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full/src/org/xtext/example/mydsl/GenerateMyDsl.mwe2
@@ -97,11 +97,10 @@ Workflow {
 			}
 			
 			// outline API
-			fragment = ui.outline.OutlineTreeProviderFragment2 {}
+			fragment = ui.outline.OutlineTreeProviderFragment2 auto-inject {}
 			
-			fragment = adapter.FragmentAdapter {
-				fragment = outline.QuickOutlineFragment auto-inject {}
-			}
+			// quick outline menu contribution
+			fragment = ui.outline.QuickOutlineFragment2 auto-inject {}
 			
 			// quickfix API
 			fragment = adapter.FragmentAdapter {
diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho/src/org/xtext/example/mydsl/GenerateMyDsl.mwe2 b/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho/src/org/xtext/example/mydsl/GenerateMyDsl.mwe2
index 4fe2c3dbb..5dcc89a56 100644
--- a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho/src/org/xtext/example/mydsl/GenerateMyDsl.mwe2
+++ b/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho/src/org/xtext/example/mydsl/GenerateMyDsl.mwe2
@@ -94,11 +94,10 @@ Workflow {
 			}
 			
 			// outline API
-			fragment = ui.outline.OutlineTreeProviderFragment2 {}
+			fragment = ui.outline.OutlineTreeProviderFragment2 auto-inject {}
 			
-			fragment = adapter.FragmentAdapter {
-				fragment = outline.QuickOutlineFragment auto-inject {}
-			}
+			// quick outline menu contribution
+			fragment = ui.outline.QuickOutlineFragment2 auto-inject {}
 			
 			// quickfix API
 			fragment = adapter.FragmentAdapter {