diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractLangsListTab.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractLangsListTab.java
index 91284b51523..a3ae9d94951 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractLangsListTab.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractLangsListTab.java
@@ -635,7 +635,7 @@ public abstract class AbstractLangsListTab extends AbstractCPropertyTab {
 			if (!toAllCfgs && !(curRcDes.equals(rcDes)))
 				continue;
 			for (ICLanguageSetting l : getLangSetting(rcDes)) {
-				if (id == l.getName() || toAllLang) {
+				if (toAllLang || id == l.getName() || (id != null && id.equals(l.getName()))) {
 					List<ICLanguageSettingEntry> lst = l.getSettingEntriesList(getKind());
 					lst.add(ent);
 					l.setSettingEntries(getKind(), lst);