diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/PluginConfigurationSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/PluginConfigurationSection.java
index 617844183b..1a0401108c 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/PluginConfigurationSection.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/PluginConfigurationSection.java
@@ -37,6 +37,7 @@
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.pde.core.IModelChangedEvent;
 import org.eclipse.pde.core.plugin.IFragmentModel;
+import org.eclipse.pde.core.plugin.IPluginBase;
 import org.eclipse.pde.core.plugin.IPluginModelBase;
 import org.eclipse.pde.core.plugin.PluginRegistry;
 import org.eclipse.pde.internal.core.iproduct.IPluginConfiguration;
@@ -232,10 +233,12 @@ private void handleRemoveAll() {
 	private void handleAddDefaults() {
 		IProduct product = getProduct();
 		Set<String> configuredPluginIDs = getConfiguredPlugins(product);
+		Set<String> allPlugins = LaunchAction.getAllLaunchedPlugins(product) //
+				.map(IPluginModelBase::getPluginBase).map(IPluginBase::getId).collect(Collectors.toSet());
 		// Build a user-presentable description of the plugins and start levels.
 		StringBuilder bundlesList = new StringBuilder();
 		RECOMMENDED_AUTOSTART_BUNDLES.forEach((pluginID, autoStartLevel) -> {
-			if (!configuredPluginIDs.contains(pluginID)) {
+			if (!configuredPluginIDs.contains(pluginID) && allPlugins.contains(pluginID)) {
 				bundlesList.append('\t');
 				bundlesList.append(pluginID);
 				bundlesList.append(", "); //$NON-NLS-1$
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/pderesources.properties b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/pderesources.properties
index 0c78df95f3..b7fc95737c 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/pderesources.properties
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/pderesources.properties
@@ -2034,7 +2034,7 @@ Product_PluginSection_newPlugin=New Plug-in...
 Product_PluginSection_recommended=Add Re&commended...
 Product_PluginSection_RecommendedBundles_title=Add Recommended Start Levels
 Product_PluginSection_RecommendedBundles_message=The following Plug-ins will be auto-started with recommended start levels:\n\n{0}\nContinue?
-Product_PluginSection_NoRecommendedBundles_message=Custom start levels already exist for plug-ins with recommended start levels. Nothing will be added to the list.
+Product_PluginSection_NoRecommendedBundles_message=For each included Plug-in with a recommended start level an entry already exists (Possibly with different level).\n\nNothing will be added to the list.
 Product_DependenciesPage_title=Contents
 ProductFileWizadPage_groupTitle=Initialize the file content
 Product_PluginSection_newFragment=New Fragment...