diff --git a/editor/js/nodes.js b/editor/js/nodes.js
index 8a6a50c03..7507798b0 100644
--- a/editor/js/nodes.js
+++ b/editor/js/nodes.js
@@ -87,13 +87,8 @@ RED.nodes = (function() {
                         break;
                     }
                 }
-                for (i=0;i<moduleList[ns.module].sets.length;i++) {
-                    if (moduleList[ns.module].sets[i].id === id) {
-                        moduleList[ns.module].sets[i].splice(i,1);
-                        break;
-                    }
-                }
-                if (moduleList[ns.module].sets.length === 0) {
+                delete moduleList[ns.module].sets[ns.name];
+                if (Object.keys(moduleList[ns.module].sets).length === 0) {
                     delete moduleList[ns.module];
                 }
                 RED.events.emit("registry:node-set-removed",ns);
diff --git a/editor/js/ui/editableList.js b/editor/js/ui/editableList.js
index a889f52ab..3446c46ee 100644
--- a/editor/js/ui/editableList.js
+++ b/editor/js/ui/editableList.js
@@ -207,9 +207,11 @@
                 var index = that.element.children().length-1;
                 setTimeout(function() {
                     that.options.addItem(row,index,data);
-                    setTimeout(function() {
-                        that.uiContainer.scrollTop(that.element.height());
-                    },0);
+                    if (!that.options.sort) {
+                        setTimeout(function() {
+                            that.uiContainer.scrollTop(that.element.height());
+                        },0);
+                    }
                 },0);
             }
         },
diff --git a/editor/js/ui/palette-editor.js b/editor/js/ui/palette-editor.js
index 2e67ea7ab..fceb574c0 100644
--- a/editor/js/ui/palette-editor.js
+++ b/editor/js/ui/palette-editor.js
@@ -22,7 +22,20 @@ RED.palette.editor = (function() {
 
     var eventTimers = {};
 
-    function changeNodeState(id,state,callback) {
+    function delayCallback(start,callback) {
+        var delta = Date.now() - start;
+        if (delta < 300) {
+            delta = 300;
+        } else {
+            delta = 0;
+        }
+        setTimeout(function() {
+            callback();
+        },delta);
+    }
+    function changeNodeState(id,state,shade,callback) {
+        shade.show();
+        var start = Date.now();
         $.ajax({
             url:"nodes/"+id,
             type: "PUT",
@@ -30,6 +43,22 @@ RED.palette.editor = (function() {
                 enabled: state
             }),
             contentType: "application/json; charset=utf-8"
+        }).done(function(data,textStatus,xhr) {
+            delayCallback(start,function() {
+                shade.hide();
+                callback();
+            });
+        }).fail(function(xhr,textStatus,err) {
+            delayCallback(start,function() {
+                shade.hide();
+                callback(xhr);
+            });
+        })
+    }
+    function removeNodeModule(id,callback) {
+        $.ajax({
+            url:"nodes/"+id,
+            type: "DELETE"
         }).done(function(data,textStatus,xhr) {
             callback();
         }).fail(function(xhr,textStatus,err) {
@@ -208,16 +237,27 @@ RED.palette.editor = (function() {
                 var removeButton = $('<a href="#" class="editor-button editor-button-small"></a>').html('remove').appendTo(buttonGroup);
                 if (!entry.local) {
                     removeButton.hide();
+                } else {
+                    removeButton.click(function() {
+                        shade.show();
+                        removeNodeModule(entry.name, function(xhr) {
+                            console.log(xhr);
+                        })
+                    })
                 }
                 var enableButton = $('<a href="#" class="editor-button editor-button-small"></a>').html('disable all').appendTo(buttonGroup);
 
                 var contentRow = $('<div>',{class:"palette-module-content"}).appendTo(container);
+                var shade = $('<div>',{class:"palette-module-shade hide"}).appendTo(container);
+                $('<img src="red/images/spin.svg" class="palette-spinner"/>').appendTo(shade);
+
 
                 object.elements = {
                     removeButton: removeButton,
                     enableButton: enableButton,
                     setCount: setCount,
                     container: container,
+                    shade: shade,
                     sets: {}
                 }
                 setButton.click(function() {
@@ -249,7 +289,8 @@ RED.palette.editor = (function() {
                     enableButton.click(function(evt) {
                         if (object.setUseCount[setName] === 0) {
                             var currentSet = RED.nodes.registry.getNodeSet(set.id);
-                            changeNodeState(set.id,!currentSet.enabled,function(xhr){
+                            shade.show();
+                            changeNodeState(set.id,!currentSet.enabled,shade,function(xhr){
                                 console.log(xhr)
                             });
                         }
@@ -264,7 +305,7 @@ RED.palette.editor = (function() {
                 });
                 enableButton.click(function(evt) {
                     if (object.totalUseCount === 0) {
-                        changeNodeState(entry.name,(container.hasClass('disabled')),function(xhr){
+                        changeNodeState(entry.name,(container.hasClass('disabled')),shade,function(xhr){
                             console.log(xhr)
                         });
                     }
@@ -292,7 +333,14 @@ RED.palette.editor = (function() {
             refreshNodeModule(ns.module);
         });
         RED.events.on('registry:node-set-removed', function(ns) {
-            refreshNodeModule(ns.module);
+            var module = RED.nodes.registry.getModule(ns.module);
+            if (!module) {
+                var entry = nodeEntries[ns.module];
+                if (entry) {
+                    nodeList.editableList('removeItem', entry);
+                    delete nodeEntries[ns.module];
+                }
+            }
         });
         RED.events.on('nodes:add', function(n) {
             typesInUse[n.type] = (typesInUse[n.type]||0)+1;
diff --git a/editor/sass/palette-editor.scss b/editor/sass/palette-editor.scss
index a5e96881f..5e8330c17 100644
--- a/editor/sass/palette-editor.scss
+++ b/editor/sass/palette-editor.scss
@@ -58,6 +58,15 @@
             margin-left: 5px;
         }
     }
+    .palette-module-shade {
+        position: absolute;
+        top: 0;
+        bottom:0;
+        left:0;
+        right:0;
+        background: rgba(255,255,255,0.8);
+        text-align: center;
+    }
     .palette-module-meta {
         overflow: hidden;
         color: #666;