diff --git a/package-lock.json b/package-lock.json
index dfb33a911..f90bf66cb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -22,7 +22,7 @@
                 "@microsoft/vscode-azext-azureappservice": "^2.2.5",
                 "@microsoft/vscode-azext-azureappsettings": "^0.2.0",
                 "@microsoft/vscode-azext-azureutils": "^2.0.2",
-                "@microsoft/vscode-azext-serviceconnector": "^0.1.2",
+                "@microsoft/vscode-azext-serviceconnector": "^0.1.3",
                 "@microsoft/vscode-azext-utils": "^2.1.0",
                 "@microsoft/vscode-azureresources-api": "^2.0.4",
                 "cross-fetch": "^4.0.0",
@@ -1123,9 +1123,9 @@
             }
         },
         "node_modules/@microsoft/vscode-azext-serviceconnector": {
-            "version": "0.1.2",
-            "resolved": "https://registry.npmjs.org/@microsoft/vscode-azext-serviceconnector/-/vscode-azext-serviceconnector-0.1.2.tgz",
-            "integrity": "sha512-yIweg5dHolgTj2k9mFprkYraxxBbC20WpODRRK5j3DcW+beXRWg+mjvpPQ2zQw2r1RMV5xElBMTP+36wDO/f8A==",
+            "version": "0.1.3",
+            "resolved": "https://registry.npmjs.org/@microsoft/vscode-azext-serviceconnector/-/vscode-azext-serviceconnector-0.1.3.tgz",
+            "integrity": "sha512-uSz23V3la2s7eLrmgq64JQpYC9+xx9neLPSirHRPpNtViaL1EooOIICjUcxjSh06XKsx1qWsHvbTxVQZRbJj3A==",
             "dependencies": {
                 "@azure/arm-servicelinker": "^2.1.0",
                 "@microsoft/vscode-azext-azureutils": "^2.0.0",
@@ -14133,9 +14133,9 @@
             }
         },
         "@microsoft/vscode-azext-serviceconnector": {
-            "version": "0.1.2",
-            "resolved": "https://registry.npmjs.org/@microsoft/vscode-azext-serviceconnector/-/vscode-azext-serviceconnector-0.1.2.tgz",
-            "integrity": "sha512-yIweg5dHolgTj2k9mFprkYraxxBbC20WpODRRK5j3DcW+beXRWg+mjvpPQ2zQw2r1RMV5xElBMTP+36wDO/f8A==",
+            "version": "0.1.3",
+            "resolved": "https://registry.npmjs.org/@microsoft/vscode-azext-serviceconnector/-/vscode-azext-serviceconnector-0.1.3.tgz",
+            "integrity": "sha512-uSz23V3la2s7eLrmgq64JQpYC9+xx9neLPSirHRPpNtViaL1EooOIICjUcxjSh06XKsx1qWsHvbTxVQZRbJj3A==",
             "requires": {
                 "@azure/arm-servicelinker": "^2.1.0",
                 "@microsoft/vscode-azext-azureutils": "^2.0.0",
diff --git a/package.json b/package.json
index 2e9c9f294..0808129a2 100644
--- a/package.json
+++ b/package.json
@@ -639,17 +639,17 @@
                 },
                 {
                     "command": "azureFunctions.createServiceConnector",
-                    "when": "view =~ /(azureResourceGroups|azureFocusView)/ && viewItem =~ /serviceConnectorGroupItem/",
+                    "when": "view =~ /(azureResourceGroups|azureFocusView)/ && viewItem =~ /azFunc.*serviceConnectorGroupItem/",
                     "group": "1@1"
                 },
                 {
                     "command": "azureFunctions.deleteServiceConnector",
-                    "when": "view =~ /(azureResourceGroups|azureFocusView)/ && viewItem =~ /serviceConnectorItem/",
+                    "when": "view =~ /(azureResourceGroups|azureFocusView)/ && viewItem =~ /azFunc.*serviceConnectorItem/",
                     "group": "1@1"
                 },
                 {
                     "command": "azureFunctions.validateServiceConnector",
-                    "when": "view =~ /(azureResourceGroups|azureFocusView)/ && viewItem =~ /serviceConnectorItem/",
+                    "when": "view =~ /(azureResourceGroups|azureFocusView)/ && viewItem =~ /azFunc.*serviceConnectorItem/",
                     "group": "1@2"
                 }
             ],
@@ -1191,8 +1191,8 @@
         "@microsoft/vscode-azext-azureappservice": "^2.2.5",
         "@microsoft/vscode-azext-azureappsettings": "^0.2.0",
         "@microsoft/vscode-azext-azureutils": "^2.0.2",
-        "@microsoft/vscode-azext-serviceconnector": "^0.1.2",
         "@microsoft/vscode-azext-utils": "^2.1.0",
+        "@microsoft/vscode-azext-serviceconnector": "^0.1.3",
         "@microsoft/vscode-azureresources-api": "^2.0.4",
         "cross-fetch": "^4.0.0",
         "escape-string-regexp": "^4.0.0",
diff --git a/src/tree/ResolvedFunctionAppResource.ts b/src/tree/ResolvedFunctionAppResource.ts
index ffc47e6b4..eecc4109c 100644
--- a/src/tree/ResolvedFunctionAppResource.ts
+++ b/src/tree/ResolvedFunctionAppResource.ts
@@ -237,7 +237,7 @@ export class ResolvedFunctionAppResource implements ResolvedAppResourceBase {
             site: this.site,
             contextValuesToAdd: ['azFunc']
         });
-        this._serviceConnectorNode = new ServiceConnectorGroupTreeItem(proxyTree, this.site.id);
+        this._serviceConnectorNode = new ServiceConnectorGroupTreeItem(proxyTree, this.site.id, ['azFunc']);
 
         if (!this._functionsTreeItem) {
             this._functionsTreeItem = await RemoteFunctionsTreeItem.createFunctionsTreeItem(context, proxyTree);