diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/common/editableList.js b/packages/node_modules/@node-red/editor-client/src/js/ui/common/editableList.js
index 975c8c300..ee29a6a35 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/common/editableList.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/common/editableList.js
@@ -327,6 +327,14 @@
         },
         length: function() {
             return this.element.children().length;
+        },
+        show: function(item) {
+            var items = this.element.children().filter(function(f) {
+                return item === $(this).find(".red-ui-editableList-item-content").data('data');
+            });
+            if (items.length > 0) {
+                this.uiContainer.scrollTop(this.uiContainer.scrollTop()+items.position().top)
+            }
         }
     });
 })(jQuery);
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/common/treeList.js b/packages/node_modules/@node-red/editor-client/src/js/ui/common/treeList.js
index e139257f7..94dafb4e7 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/common/treeList.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/common/treeList.js
@@ -171,6 +171,13 @@
             } else {
                 return this._data;
             }
+        },
+        show: function(id) {
+            for (var i=0;i<this._data.length;i++) {
+                if (this._data[i].id === id) {
+                    this._topList.editableList('show',this._data[i]);
+                }
+            }
         }
     });
 
diff --git a/packages/node_modules/@node-red/nodes/core/core/60-link.html b/packages/node_modules/@node-red/nodes/core/core/60-link.html
index eedbaae2d..3e3cd1f1e 100644
--- a/packages/node_modules/@node-red/nodes/core/core/60-link.html
+++ b/packages/node_modules/@node-red/nodes/core/core/60-link.html
@@ -54,7 +54,7 @@
             flowMap[activeSubflow.id] = {
                 id: activeSubflow.id,
                 class: 'palette-header',
-                label:  "Subflow : "+(activeSubflow.name || activeSubflow.id),
+                label:  "Subflow : "+(activeSubflow.name || activeSubflow.id)+(node.z===ws.id ? " *":""),
                 expanded: true,
                 children: []
             };
@@ -64,8 +64,8 @@
                 flowMap[ws.id] = {
                     id: ws.id,
                     class: 'palette-header',
-                    label: (ws.label || ws.id),
-                    expanded: ws.id === node.z,
+                    label: (ws.label || ws.id)+(node.z===ws.id ? " *":""),
+                    expanded: true,
                     children: []
                 }
                 flows.push(flowMap[ws.id])
@@ -88,7 +88,10 @@
             }
         });
         flows = flows.filter(function(f) { return f.children.length > 0 })
-        treeList.treeList('data',flows)
+        treeList.treeList('data',flows);
+        setTimeout(function() {
+            treeList.treeList('show',node.z);
+        },100);
     }
 
     function resizeNodeList() {