diff --git a/packages/node_modules/@node-red/editor-client/src/js/nodes.js b/packages/node_modules/@node-red/editor-client/src/js/nodes.js
index 17ba67ce7..d956684ce 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/nodes.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/nodes.js
@@ -1296,8 +1296,13 @@ RED.nodes = (function() {
     function filterNodes(filter) {
         var result = [];
         var searchSet = nodes;
-        if (filter.hasOwnProperty("z") && Object.hasOwnProperty("values") && nodeTabMap.hasOwnProperty(filter.z) ) {
-            searchSet = Object.values(nodeTabMap[filter.z]);
+        var doZFilter = false;
+        if (filter.hasOwnProperty("z")) {
+            if (Object.hasOwnProperty("values") && nodeTabMap.hasOwnProperty(filter.z) ) {
+                searchSet = Object.values(nodeTabMap[filter.z]);
+            } else {
+                doZFilter = true;
+            }
         }
 
         for (var n=0;n<searchSet.length;n++) {
@@ -1305,6 +1310,9 @@ RED.nodes = (function() {
             if (filter.hasOwnProperty("type") && node.type !== filter.type) {
                 continue;
             }
+            if (doZFilter && node.z !== filter.z) {
+                continue;
+            }
             result.push(node);
         }
         return result;