diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/controller/ControllerFacade.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/controller/ControllerFacade.java
index 66a50731f0..a4e8000f68 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/controller/ControllerFacade.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/controller/ControllerFacade.java
@@ -79,6 +79,8 @@ import org.apache.nifi.provenance.search.QuerySubmission;
 import org.apache.nifi.provenance.search.SearchTerm;
 import org.apache.nifi.provenance.search.SearchTerms;
 import org.apache.nifi.provenance.search.SearchableField;
+import org.apache.nifi.registry.ComponentVariableRegistry;
+import org.apache.nifi.registry.VariableDescriptor;
 import org.apache.nifi.registry.VariableRegistry;
 import org.apache.nifi.remote.RemoteGroupPort;
 import org.apache.nifi.remote.RootGroupPort;
@@ -1754,6 +1756,16 @@ public class ControllerFacade implements Authorizable {
         addIfAppropriate(searchStr, group.getName(), "Name", matches);
         addIfAppropriate(searchStr, group.getComments(), "Comments", matches);
 
+        final ComponentVariableRegistry varRegistry = group.getVariableRegistry();
+        if (varRegistry != null) {
+            final Map<VariableDescriptor, String> variableMap = varRegistry.getVariableMap();
+            for (final Map.Entry<VariableDescriptor, String> entry : variableMap.entrySet()) {
+                addIfAppropriate(searchStr, entry.getKey().getName(), "Variable Name", matches);
+                addIfAppropriate(searchStr, entry.getValue(), "Variable Value", matches);
+            }
+        }
+
+
         if (matches.isEmpty()) {
             return null;
         }