diff --git a/scripts/system/edit.js b/scripts/system/edit.js
index 05f5e3cb19..c751adfc78 100644
--- a/scripts/system/edit.js
+++ b/scripts/system/edit.js
@@ -2027,12 +2027,8 @@ var PropertiesTool = function (opts) {
         } else if (data.type === "update") {
             selectionManager.saveProperties();
             if (selectionManager.selections.length > 1) {
-                properties = {
-                    locked: data.properties.locked,
-                    visible: data.properties.visible
-                };
                 for (i = 0; i < selectionManager.selections.length; i++) {
-                    Entities.editEntity(selectionManager.selections[i], properties);
+                    Entities.editEntity(selectionManager.selections[i], data.properties);
                 }
             } else if (data.properties) {
                 if (data.properties.dynamic === false) {
diff --git a/scripts/system/html/js/colpick.js b/scripts/system/html/js/colpick.js
index 199c624bc5..505dd294d6 100644
--- a/scripts/system/html/js/colpick.js
+++ b/scripts/system/html/js/colpick.js
@@ -269,6 +269,9 @@ For usage and examples: colpick.com/plugin
             },
             // Show/hide the color picker
             show = function (ev) {
+                if ($(this).attr('disabled')) {
+                    return;
+                }
                 // Prevent the trigger of any direct parent
                 ev.stopPropagation();
                 var cal = $('#' + $(this).data('colpickId'));