diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/tab-config.js b/packages/node_modules/@node-red/editor-client/src/js/ui/tab-config.js
index 315a8dbb3..2c339f044 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/tab-config.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/tab-config.js
@@ -53,6 +53,9 @@ RED.sidebar.config = (function() {
             }
             $('<span class="red-ui-sidebar-node-config-filter-info"></span>').appendTo(header);
             category = $('<ul class="red-ui-palette-content red-ui-sidebar-node-config-list"></ul>').appendTo(container);
+            category.on("click", function(e) {
+                $(content).find(".red-ui-palette-node").removeClass("selected");
+            });
             container.i18n();
             var icon = header.find("i");
             var result = {
@@ -139,11 +142,12 @@ RED.sidebar.config = (function() {
                     currentType = node.type;
                 }
 
-                var entry = $('<li class="red-ui-palette-node red-ui-palette-node-config red-ui-palette-node_id_'+node.id.replace(/\./g,"-")+'"></li>').appendTo(list);
+                var entry = $('<li class="red-ui-palette-node_id_'+node.id.replace(/\./g,"-")+'"></li>').appendTo(list);
+                var nodeDiv = $('<div class="red-ui-palette-node-config red-ui-palette-node"></div>').appendTo(entry);
                 entry.data('node',node.id);
-                $('<div class="red-ui-palette-label"></div>').text(label).appendTo(entry);
+                $('<div class="red-ui-palette-label"></div>').text(label).appendTo(nodeDiv);
                 if (node._def.hasUsers !== false) {
-                    var iconContainer = $('<div/>',{class:"red-ui-palette-icon-container red-ui-palette-icon-container-right"}).appendTo(entry);
+                    var iconContainer = $('<div/>',{class:"red-ui-palette-icon-container red-ui-palette-icon-container-right"}).appendTo(nodeDiv);
                     if (node.users.length === 0) {
                         iconContainer.text(0);
                     } else {
@@ -155,10 +159,11 @@ RED.sidebar.config = (function() {
                     }
                     RED.popover.tooltip(iconContainer,RED._('editor.nodesUse',{count:node.users.length}));
                     if (node.users.length === 0) {
-                        entry.addClass("red-ui-palette-node-config-unused");
+                        nodeDiv.addClass("red-ui-palette-node-config-unused");
                     }
                 }
-                entry.on('click',function(e) {
+                nodeDiv.on('click',function(e) {
+                    e.stopPropagation();
                     RED.view.select(false);
                     if (e.metaKey) {
                         $(this).toggleClass("selected");
@@ -168,11 +173,12 @@ RED.sidebar.config = (function() {
                     }
                     RED.sidebar.info.refresh(node);
                 });
-                entry.on('dblclick',function(e) {
+                nodeDiv.on('dblclick',function(e) {
+                    e.stopPropagation();
                     RED.editor.editConfig("", node.type, node.id);
                 });
                 var userArray = node.users.map(function(n) { return n.id });
-                entry.on('mouseover',function(e) {
+                nodeDiv.on('mouseover',function(e) {
                     RED.nodes.eachNode(function(node) {
                         if( userArray.indexOf(node.id) != -1) {
                             node.highlighted = true;
@@ -181,7 +187,7 @@ RED.sidebar.config = (function() {
                     });
                     RED.view.redraw();
                 });
-                entry.on('mouseout',function(e) {
+                nodeDiv.on('mouseout',function(e) {
                     RED.nodes.eachNode(function(node) {
                         if(node.highlighted) {
                             node.highlighted = false;
diff --git a/packages/node_modules/@node-red/editor-client/src/sass/header.scss b/packages/node_modules/@node-red/editor-client/src/sass/header.scss
index 29ccc0b5e..2dd4bae52 100644
--- a/packages/node_modules/@node-red/editor-client/src/sass/header.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/header.scss
@@ -223,9 +223,8 @@
         > li:focus > a {
             background: $header-menu-item-hover !important;
         }
-        li.divider {
+        li.red-ui-menu-divider {
             background: $headerMenuItemDivider;
-            border-bottom-color: $header-menu-item-hover;
         }
         li.disabled a {
             color:  $header-menu-color-disabled;
diff --git a/packages/node_modules/@node-red/editor-client/src/sass/tab-config.scss b/packages/node_modules/@node-red/editor-client/src/sass/tab-config.scss
index b57e7ddfd..69a2ee5dd 100644
--- a/packages/node_modules/@node-red/editor-client/src/sass/tab-config.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/tab-config.scss
@@ -22,15 +22,28 @@
     @include disable-selection;
 }
 
-.red-ui-sidebar-node-config-list {
+ul.red-ui-sidebar-node-config-list {
     margin: 0;
+    padding: 0;
     list-style-type: none;
+    li {
+        padding: 0;
+        margin: 0;
+        text-align: center;
+    }
     .red-ui-palette-node {
         overflow: hidden;
+
         &.selected {
-            margin: 10px auto;
+            margin: 4px auto;
             border-color: $node-selected-color;
             border-width: 2px;
+            &:first-child {
+                margin-top: 9px;
+            }
+            &:last-child {
+                margin-bottom: 9px;
+            }
         }
     }
     .red-ui-palette-label {
@@ -68,7 +81,7 @@
     color: $primary-text-color;
     cursor: pointer;
 }
-.red-ui-palette-node-config-type {
+ul.red-ui-sidebar-node-config-list li.red-ui-palette-node-config-type {
     color: $secondary-text-color;
     text-align: right;
     padding-right: 3px;