diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/deploy.js b/packages/node_modules/@node-red/editor-client/src/js/ui/deploy.js
index 25a67907c..ed503bcfe 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/deploy.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/deploy.js
@@ -589,7 +589,9 @@ RED.deploy = (function() {
                 RED.notify('<p>' + RED._("deploy.successfulDeploy") + '</p>', "success");
             }
             const flowsToLock = new Set()
+            // Node's properties cannot be modified if its workspace is locked.
             function ensureUnlocked(id) {
+                // TODO: `RED.nodes.subflow` is useless
                 const flow = id && (RED.nodes.workspace(id) || RED.nodes.subflow(id) || null);
                 const isLocked = flow ? flow.locked : false;
                 if (flow && isLocked) {
@@ -642,6 +644,7 @@ RED.deploy = (function() {
                     delete confNode.credentials;
                 }
             });
+            // Subflow cannot be locked
             RED.nodes.eachSubflow(function (subflow) {
                 if (subflow.changed) {
                     subflow.changed = false;
@@ -650,12 +653,18 @@ RED.deploy = (function() {
             });
             RED.nodes.eachWorkspace(function (ws) {
                 if (ws.changed || ws.added) {
-                    ensureUnlocked(ws.z)
+                    // Ensure the Workspace is unlocked to modify its properties.
+                    ensureUnlocked(ws.id);
                     ws.changed = false;
                     delete ws.added
+                    if (flowsToLock.has(ws)) {
+                        ws.locked = true;
+                        flowsToLock.delete(ws);
+                    }
                     RED.events.emit("flows:change", ws)
                 }
             });
+            // Ensures all workspaces to be locked have been locked.
             flowsToLock.forEach(flow => {
                 flow.locked = true
             })