diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/common/typedInput.js b/packages/node_modules/@node-red/editor-client/src/js/ui/common/typedInput.js
index ad13010fe..e9e7294e9 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/common/typedInput.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/common/typedInput.js
@@ -122,7 +122,8 @@
     const contextAutoComplete = function(options) {
 
         const getContextKeysFromRuntime = function(scope, store, searchKey, done) {
-            contextKnownKeys[store] = contextKnownKeys[store] || new Set()
+            contextKnownKeys[scope] = contextKnownKeys[scope] || {}
+            contextKnownKeys[scope][store] = contextKnownKeys[scope][store] || new Set()
             if (searchKey.length > 0) {
                 try {
                     RED.utils.normalisePropertyExpression(searchKey)
@@ -209,7 +210,8 @@
                         });
                     }
                 })
-                done(matches)
+                matches.sort(function(a, b) { return a.value.localeCompare(b.value) });
+                done(matches);
             })
         }
     }