diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/clipboard.js b/packages/node_modules/@node-red/editor-client/src/js/ui/clipboard.js
index cb8fe136f..5e9bb8724 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/clipboard.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/clipboard.js
@@ -676,7 +676,8 @@ RED.clipboard = (function() {
                     done(children);
                 })
             }
-        }]);
+        }], true);
+
     }
 
     function hideDropTarget() {
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 e47ef4ab2..50757e1c7 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
@@ -384,7 +384,11 @@
                 })
                 return res;
             }
-            return s.parent().data('data');
+            if (s.length) {
+                return s.parent().data('data');
+            } else {
+                return undefined;
+            }
         }
     });
 
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/library.js b/packages/node_modules/@node-red/editor-client/src/js/ui/library.js
index 1c3c9d15b..e25223f94 100755
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/library.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/library.js
@@ -431,11 +431,13 @@ RED.library = (function() {
             focus: function() {
                 dirList.focus();
             },
-            data: function(content) {
+            data: function(content,selectFirst) {
                 dirList.treeList('data',content);
-                // setTimeout(function() {
-                //     dirList.treeList('select',content[0]);
-                // },100);
+                if (selectFirst) {
+                    setTimeout(function() {
+                        dirList.treeList('select',content[0]);
+                    },100);
+                }
             }
         }
     }