diff --git a/code/src/CoreTemplateStudio/CoreTemplateStudio.Core/Templates/TemplatesRepository.cs b/code/src/CoreTemplateStudio/CoreTemplateStudio.Core/Templates/TemplatesRepository.cs
index acdf943..8e2442b 100644
--- a/code/src/CoreTemplateStudio/CoreTemplateStudio.Core/Templates/TemplatesRepository.cs
+++ b/code/src/CoreTemplateStudio/CoreTemplateStudio.Core/Templates/TemplatesRepository.cs
@@ -138,7 +138,7 @@ public ITemplateInfo Find(Func<ITemplateInfo, bool> predicate)
         public IEnumerable<MetadataInfo> GetProjectTypes(UserSelectionContext context)
         {
             var projectTypes = GetSupportedProjectTypes(context);
-            return GetMetadataInfo("projectTypes").Where(m => m.Platform == context.Platform && projectTypes.Contains(m.Name));
+            return GetMetadataInfo("projectTypes").Where(m => m.Platform == context.Platform && (projectTypes.Contains(m.Name) || projectTypes.Contains(All)));
         }
 
         public IEnumerable<MetadataInfo> GetFrontEndFrameworks(UserSelectionContext context)
@@ -317,7 +317,7 @@ private IEnumerable<SupportedFramework> GetSupportedFx(UserSelectionContext cont
         {
             var filtered = GetAll()
                           .Where(t => t.GetTemplateType() == TemplateType.Project
-                          && t.GetProjectTypeList().Contains(context.ProjectType)
+                          && (t.GetProjectTypeList().Contains(context.ProjectType) || t.GetProjectTypeList().Contains(All))
                           && IsMatchPropertyBag(t, context.PropertyBag)
                           && t.GetPlatform().Equals(context.Platform, StringComparison.OrdinalIgnoreCase)).ToList();