diff --git a/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/TemplateEngine.java b/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/TemplateEngine.java
index 944bc7fd4ff..54b8589731f 100644
--- a/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/TemplateEngine.java
+++ b/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/TemplateEngine.java
@@ -303,7 +303,7 @@ public class TemplateEngine {
 						if (toolChains[j].equals(toolChain)) {
 							if ((usageFilter != null) && (filterPattern != null) && usageFilter.matches(filterPattern)) {
 								matchedTemplateInfoList.add(templateInfo);
-							} else if (usageFilter == null) {
+							} else if (usageFilter == null || filterPattern==null) {
 								matchedTemplateInfoList.add(templateInfo);
 							}
 							continue;
@@ -312,7 +312,7 @@ public class TemplateEngine {
 				} else {
 					if ((usageFilter != null) && (filterPattern != null) && usageFilter.matches(filterPattern)) {
 						matchedTemplateInfoList.add(templateInfo);
-					} else if (usageFilter == null) {
+					} else if (usageFilter == null || filterPattern==null) {
 						matchedTemplateInfoList.add(templateInfo);
 					}
 				}