diff --git a/src/common/Elsa.Features/Services/ShellInstalledFeatureProvider.cs b/src/common/Elsa.Features/Services/ShellInstalledFeatureProvider.cs
index 4b27ab1fee..506ce6fff6 100644
--- a/src/common/Elsa.Features/Services/ShellInstalledFeatureProvider.cs
+++ b/src/common/Elsa.Features/Services/ShellInstalledFeatureProvider.cs
@@ -35,8 +35,9 @@ public IEnumerable<FeatureDescriptor> List()
     /// <inheritdoc />
     public FeatureDescriptor? Find(string fullName)
     {
-        var shellFeature = _shellFeatures.FirstOrDefault(sf =>
-            MapToFullName(sf) == fullName);
+        var shellFeature = _shellFeatures
+            .Where(sf => sf.StartupType != null)
+            .FirstOrDefault(sf => MapToFullName(sf) == fullName);
 
         return shellFeature != null ? MapToElsaFeatureDescriptor(shellFeature) : null;
     }
diff --git a/src/modules/Elsa.Workflows.Management/ShellFeatures/WorkflowManagementFeature.cs b/src/modules/Elsa.Workflows.Management/ShellFeatures/WorkflowManagementFeature.cs
index 8c81f0e9a1..6f54bfefcf 100644
--- a/src/modules/Elsa.Workflows.Management/ShellFeatures/WorkflowManagementFeature.cs
+++ b/src/modules/Elsa.Workflows.Management/ShellFeatures/WorkflowManagementFeature.cs
@@ -56,7 +56,7 @@ public class WorkflowManagementFeature : IShellFeature
     /// </summary>
     public HashSet<VariableDescriptor> VariableDescriptors { get; } =
     [
-        new(typeof(object), PrimitivesCategory, "The root class for all object in the CLR System."),
+        new(typeof(object), PrimitivesCategory, "The root class for all objects in the CLR System."),
         new(typeof(string), PrimitivesCategory, "Represents a static string of characters."),
         new(typeof(bool), PrimitivesCategory, "Represents a true or false value."),
         new(typeof(int), PrimitivesCategory, "A 32 bit integer."),