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 5ace86456..ac14e2689 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
@@ -370,6 +370,8 @@ RED.clipboard = (function() {
                 }
                 if (tab.id === "clipboard-dialog-import-tab-clipboard") {
                     $("#clipboard-import").focus();
+                } else {
+                    libraryBrowser.focus();
                 }
                 validateImport();
             }
@@ -471,6 +473,7 @@ RED.clipboard = (function() {
                 } else {
                     $("#clipboard-dialog-export").button("option","label", RED._("clipboard.export.export"))
                     $("#clipboard-dialog-download").hide();
+                    libraryBrowser.focus();
                 }
 
             }
@@ -492,7 +495,7 @@ RED.clipboard = (function() {
 
         libraryBrowser = RED.library.createBrowser({
             container: $("#clipboard-dialog-export-tab-library-browser"),
-            addFolderButton: true,
+            folderTools: true,
             onselect: function(file) {
                 if (file && file.label && !file.children) {
                     $("#clipboard-dialog-tab-library-name").val(file.label);
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 925acfba4..0b21ca146 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
@@ -51,8 +51,55 @@
             var that = this;
 
             this.element.addClass('red-ui-treeList');
+            this.element.attr("tabIndex",0);
             var wrapper = $('<div>',{class:'red-ui-treeList-container'}).appendTo(this.element);
-
+            this.element.on('keydown', function(evt) {
+                var selected = that._topList.find(".selected").parent().data('data');
+                if (!selected && (evt.keyCode === 40 || evt.keyCode === 38)) {
+                    that.select(that._data[0]);
+                    return;
+                }
+                var target;
+                switch(evt.keyCode) {
+                    case 37: // LEFT
+                        if (selected.children&& selected.treeList.container.hasClass("expanded")) {
+                            selected.treeList.collapse()
+                        } else if (selected.parent) {
+                            target = selected.parent;
+                        }
+                    break;
+                    case 38: // UP
+                        target = that._getPreviousSibling(selected);
+                        if (target) {
+                            target = that._getLastDescendant(target);
+                        }
+                        if (!target && selected.parent) {
+                            target = selected.parent;
+                        }
+                    break;
+                    case 39: // RIGHT
+                        if (selected.children) {
+                            if (!selected.treeList.container.hasClass("expanded")) {
+                                selected.treeList.expand()
+                            }
+                        }
+                    break
+                    case 40: //DOWN
+                        if (selected.children && Array.isArray(selected.children) && selected.children.length > 0 && selected.treeList.container.hasClass("expanded")) {
+                            target = selected.children[0];
+                        } else {
+                            target = that._getNextSibling(selected);
+                            while (!target && selected.parent) {
+                                selected = selected.parent;
+                                target = that._getNextSibling(selected);
+                            }
+                        }
+                    break
+                }
+                if (target) {
+                    that.select(target);
+                }
+            });
             this._data = [];
 
             this._topList = $('<ol>').css({
@@ -68,11 +115,46 @@
                 addItem: function(container,i,item) {
                     that._addSubtree(that._topList,container,item,0);
                 }
-            });
+            })
             if (this.options.data) {
                 this.data(this.options.data);
             }
         },
+        _getLastDescendant: function(item) {
+            // Gets the last visible descendant of the item
+            if (!item.children || !item.treeList.container.hasClass("expanded") || item.children.length === 0) {
+                return item;
+            }
+            return this._getLastDescendant(item.children[item.children.length-1]);
+        },
+        _getPreviousSibling: function(item) {
+            var candidates;
+            if (!item.parent) {
+                candidates = this._data;
+            } else {
+                candidates = item.parent.children;
+            }
+            var index = candidates.indexOf(item);
+            if (index === 0) {
+                return null;
+            } else {
+                return candidates[index-1];
+            }
+        },
+        _getNextSibling: function(item) {
+            var candidates;
+            if (!item.parent) {
+                candidates = this._data;
+            } else {
+                candidates = item.parent.children;
+            }
+            var index = candidates.indexOf(item);
+            if (index === candidates.length - 1) {
+                return null;
+            } else {
+                return candidates[index+1];
+            }
+        },
         _addChildren: function(container,parent,children,depth) {
             var that = this;
             var subtree = $('<ol>').appendTo(container).editableList({
@@ -92,15 +174,21 @@
         _addSubtree: function(parentList, container, item, depth) {
             var that = this;
             item.treeList = {};
+            item.treeList.container = container;
+
             item.treeList.parentList = parentList;
             item.treeList.remove = function() {
                 parentList.editableList('removeItem',item);
+                if (item.parent) {
+                    var index = item.parent.children.indexOf(item);
+                    item.parent.children.splice(index,1)
+                }
             }
-            var labelNodeType = "<label>";
-            if (item.children && item.hasOwnProperty('selected')) {
-                labelNodeType = "<div>";
-            }
-            var label = $(labelNodeType,{tabindex:"0",class:"red-ui-treeList-label"}).appendTo(container);
+            var labelNodeType = "<div>";
+            // if (item.children && item.hasOwnProperty('selected')) {
+            //     labelNodeType = "<div>";
+            // }
+            var label = $(labelNodeType,{class:"red-ui-treeList-label"}).appendTo(container);
             item.treeList.label = label;
             if (item.class) {
                 label.addClass(item.class);
@@ -110,13 +198,25 @@
             })
             label.on('mouseover',function(e) { that._trigger('itemmouseover',e,item); })
             label.on('mouseout',function(e) { that._trigger('itemmouseout',e,item); })
+            label.on('mouseenter',function(e) { that._trigger('itemmouseenter',e,item); })
+            label.on('mouseleave',function(e) { that._trigger('itemmouseleave',e,item); })
 
             if (item.children) {
-                item.treeList.addChild = function(newItem) {
+                item.treeList.addChild = function(newItem,select) {
                     item.treeList.childList.editableList('addItem',newItem)
+                    newItem.parent = item;
                     item.children.push(newItem);
+                    if (select) {
+                        setTimeout(function() {
+                            that.select(newItem)
+                        },100);
+                    }
                 }
-                item.treeList.expand = function() {
+                item.treeList.expand = function(done) {
+                    if (container.hasClass("expanded")) {
+                        done && done();
+                        return;
+                    }
                     if (!container.hasClass("built") && typeof item.children === 'function') {
                         container.addClass('built');
                         var childrenAdded = false;
@@ -139,6 +239,7 @@
                                     spinner.remove();
                                 }
                             }
+                            done && done();
                             that._trigger("childrenloaded",null,item)
                         });
                         if (!childrenAdded) {
@@ -150,9 +251,9 @@
 
                     } else {
                         item.treeList.childList.slideDown('fast');
+                        done && done();
                     }
                     container.addClass("expanded");
-
                 }
                 item.treeList.collapse = function() {
                     item.treeList.childList.slideUp('fast');
@@ -163,7 +264,9 @@
                 // $('<span class="red-ui-treeList-icon"><i class="fa fa-folder-o" /></span>').appendTo(label);
                 label.click(function(e) {
                     if (container.hasClass("expanded")) {
-                        item.treeList.collapse();
+                        if (item.hasOwnProperty('selected') || label.hasClass("selected")) {
+                            item.treeList.collapse();
+                        }
                     } else {
                         item.treeList.expand();
                     }
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 b78a31a8b..c2c68a510 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
@@ -61,6 +61,7 @@ RED.library = (function() {
         if (!selectedPath.children) {
             selectedPath = selectedPath.parent;
         }
+
         var queryArgs = [];
         var data = {};
         for (var i=0; i<activeLibrary.fields.length; i++) {
@@ -287,91 +288,117 @@ RED.library = (function() {
         console.warn("Deprecated call to RED.library.export");
     }
 
+    var menuOptionMenu;
     function createBrowser(options) {
         var panes = $('<div class="red-ui-library-browser"></div>').appendTo(options.container);
         var dirList = $("<div>").css({width: "100%", height: "100%"}).appendTo(panes)
             .treeList({}).on('treelistselect', function(event, item) {
-                if (addButton) {
-                    if (item.writable === false) {
-                        addButton.prop('disabled', true);
-                    } else {
-                        addButton.prop('disabled', false);
-                    }
-                }
                 if (options.onselect) {
                     options.onselect(item);
                 }
             });
-        var addButton;
-        if (options.addFolderButton) {
-            var tools = $("<div>").css({position: "absolute",bottom:"3px",right:"25px"}).appendTo(panes)
-            addButton= $('<button type="button" class="editor-button editor-button-small"><i class="fa fa-plus"> <i class="fa fa-folder-o"></button>').appendTo(tools).click(function(e) {
-                var defaultFolderName = "new-folder";
-                var defaultFolderNameMatches = {};
+        var itemTools = $("<div>").css({position: "absolute",bottom:"6px",right:"8px"});
+        var menuButton = $('<button class="editor-button editor-button-small" type="button"><i class="fa fa-ellipsis-h"></i></button>')
+            .click(function(evt) {
+                evt.preventDefault();
+                evt.stopPropagation();
+                var elementPos = menuButton.offset();
 
-                var selected = dirList.treeList('selected');
-                if (!selected.children) {
-                    selected = selected.parent;
-                }
-                selected.children.forEach(function(c) {
-                    if (/^new-folder/.test(c.label)) {
-                        defaultFolderNameMatches[c.label] = true
-                    }
-                });
-                var folderIndex = 2;
-                while(defaultFolderNameMatches[defaultFolderName]) {
-                    defaultFolderName = "new-folder-"+(folderIndex++)
-                }
+                var menuOptionMenu = RED.menu.init({id:"red-ui-library-browser-menu",
+                    options: [
+                        {id:"red-ui-library-browser-menu-addFolder",label:"New folder", onselect: function() {
+                            var defaultFolderName = "new-folder";
+                            var defaultFolderNameMatches = {};
 
-                selected.treeList.expand();
-                var input = $('<input type="text" class="red-ui-treeList-input">').val(defaultFolderName);
-                var newItem = {
-                    icon: "fa fa-folder-o",
-                    children:[],
-                    path: selected.path,
-                    element: input
-                }
-                var confirmAdd = function() {
-                    var val = input.val().trim();
-                    if (val === "") {
-                        cancelAdd();
-                        return;
-                    } else {
-                        for (var i=0;i<selected.children.length;i++) {
-                            if (selected.children[i].label === val) {
-                                cancelAdd();
-                                return;
+                            var selected = dirList.treeList('selected');
+                            if (!selected.children) {
+                                selected = selected.parent;
                             }
-                        }
-                    }
-                    newItem.treeList.remove();
-                    selected.treeList.addChild({
-                        icon: "fa fa-folder",
-                        children:[],
-                        label: val,
-                        path: newItem.path+val+"/"
-                    });
+                            var complete = function() {
+                                selected.children.forEach(function(c) {
+                                    if (/^new-folder/.test(c.label)) {
+                                        defaultFolderNameMatches[c.label] = true
+                                    }
+                                });
+                                var folderIndex = 2;
+                                while(defaultFolderNameMatches[defaultFolderName]) {
+                                    defaultFolderName = "new-folder-"+(folderIndex++)
+                                }
+
+                                selected.treeList.expand();
+                                var input = $('<input type="text" class="red-ui-treeList-input">').val(defaultFolderName);
+                                var newItem = {
+                                    icon: "fa fa-folder-o",
+                                    children:[],
+                                    path: selected.path,
+                                    element: input
+                                }
+                                var confirmAdd = function() {
+                                    var val = input.val().trim();
+                                    if (val === "") {
+                                        cancelAdd();
+                                        return;
+                                    } else {
+                                        for (var i=0;i<selected.children.length;i++) {
+                                            if (selected.children[i].label === val) {
+                                                cancelAdd();
+                                                return;
+                                            }
+                                        }
+                                    }
+                                    newItem.treeList.remove();
+                                    var finalItem = {
+                                        library: selected.library,
+                                        type: selected.type,
+                                        icon: "fa fa-folder",
+                                        children:[],
+                                        label: val,
+                                        path: newItem.path+val+"/"
+                                    }
+                                    selected.treeList.addChild(finalItem,true);
+                                }
+                                var cancelAdd = function() {
+                                    newItem.treeList.remove();
+                                }
+                                input.on('keydown', function(evt) {
+                                    evt.stopPropagation();
+                                    if (evt.keyCode === 13) {
+                                        confirmAdd();
+                                    } else if (evt.keyCode === 27) {
+                                        cancelAdd();
+                                    }
+                                })
+                                input.blur(function() {
+                                    confirmAdd();
+                                })
+                                selected.treeList.addChild(newItem);
+                                setTimeout(function() {
+                                    input.focus();
+                                    input.select();
+                                },400);
+                            }
+                            selected.treeList.expand(complete);
+
+                        } },
+                        // null,
+                        // {id:"red-ui-library-browser-menu-rename",label:"Rename", onselect: function() {} },
+                        // {id:"red-ui-library-browser-menu-delete",label:"Delete", onselect: function() {} }
+                    ]
+                }).on('mouseleave', function(){ $(this).remove(); dirList.focus() })
+                  .on('mouseup', function() { var self = $(this);self.hide(); dirList.focus(); setTimeout(function() { self.remove() },100)})
+                  .appendTo("body");
+                menuOptionMenu.css({
+                    position: "absolute",
+                    top: elementPos.top+"px",
+                    left: (elementPos.left - menuOptionMenu.width() + 20)+"px"
+                }).show();
+
+            }).appendTo(itemTools);
+        if (options.folderTools) {
+            dirList.on('treelistselect', function(event, item) {
+                if (item.writable !== false && item.treeList) {
+                    itemTools.appendTo(item.treeList.label);
                 }
-                var cancelAdd = function() {
-                    newItem.treeList.remove();
-                }
-                input.on('keydown', function(evt) {
-                    if (evt.keyCode === 13) {
-                        evt.stopPropagation();
-                        confirmAdd();
-                    } else if (evt.keyCode === 27) {
-                        evt.stopPropagation();
-                        cancelAdd();
-                    }
-                })
-                input.blur(function() {
-                    confirmAdd();
-                })
-                selected.treeList.addChild(newItem);
-                setTimeout(function() {
-                    input.focus();
-                    input.select();
-                },200);
             });
         }
 
@@ -379,11 +406,14 @@ RED.library = (function() {
             getSelected: function() {
                 return dirList.treeList('selected');
             },
+            focus: function() {
+                dirList.focus();
+            },
             data: function(content) {
                 dirList.treeList('data',content);
-                setTimeout(function() {
-                    dirList.treeList('select',content[0]);
-                },100);
+                // setTimeout(function() {
+                //     dirList.treeList('select',content[0]);
+                // },100);
             }
         }
     }
diff --git a/packages/node_modules/@node-red/editor-client/src/sass/library.scss b/packages/node_modules/@node-red/editor-client/src/sass/library.scss
index 5cbd9e24d..6b832f461 100644
--- a/packages/node_modules/@node-red/editor-client/src/sass/library.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/library.scss
@@ -112,7 +112,6 @@
 .red-ui-library-browser {
     position: relative;
     height: 100%;
-
     .red-ui-treeList-container {
         background: white;
         border: none;
diff --git a/packages/node_modules/@node-red/editor-client/src/sass/ui/common/treeList.scss b/packages/node_modules/@node-red/editor-client/src/sass/ui/common/treeList.scss
index 17a304221..ea217cffe 100644
--- a/packages/node_modules/@node-red/editor-client/src/sass/ui/common/treeList.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/ui/common/treeList.scss
@@ -15,7 +15,9 @@
  **/
 
 .red-ui-treeList {
-
+    &:focus {
+        outline: none !important;
+    }
 }
 
 .red-ui-treeList-container {
@@ -64,10 +66,6 @@
         }
     }
 }
-label.red-ui-treeList-label {
-    display: block;
-    width: auto;
-}
 .red-ui-treeList-label {
     @include disable-selection;
     padding: 6px 0;
@@ -77,6 +75,7 @@ label.red-ui-treeList-label {
     cursor: pointer;
     vertical-align: middle;
     margin: 0;
+    position: relative;
 
     // &:hover {
     //     background: $list-item-background-hover;