diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/workspaces.js b/packages/node_modules/@node-red/editor-client/src/js/ui/workspaces.js
index c3943b0d5..bb64f848a 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/workspaces.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/workspaces.js
@@ -157,17 +157,27 @@ RED.workspaces = (function() {
                 tabflowEditor.resize();
             },
             open: function(tray) {
+                var trayFooter = tray.find(".red-ui-tray-footer");
                 var trayBody = tray.find('.red-ui-tray-body');
+                var trayFooterLeft = $('<div class="red-ui-tray-footer-left"></div>').appendTo(trayFooter)
+
                 var dialogForm = $('<form id="dialog-form" class="form-horizontal"></form>').appendTo(trayBody);
                 $('<div class="form-row">'+
                     '<label for="node-input-name" data-i18n="[append]editor:common.label.name"><i class="fa fa-tag"></i> </label>'+
                     '<input type="text" id="node-input-name">'+
                 '</div>').appendTo(dialogForm);
 
-                $('<div class="form-row">'+
-                    '<label for="node-input-disabled" data-i18n="editor:workspace.status"></label>'+
-                    '<input type="checkbox" id="node-input-disabled"/>'+
-                '</div>').appendTo(dialogForm);
+
+                if (!workspace.hasOwnProperty("disabled")) {
+                    workspace.disabled = false;
+                }
+
+                $('<input id="node-input-disabled" type="checkbox">').prop("checked",workspace.disabled).appendTo(trayFooterLeft).toggleButton({
+                    enabledIcon: "fa-circle-thin",
+                    disabledIcon: "fa-ban",
+                    invertState: true
+                })
+
 
                 var row = $('<div class="form-row node-text-editor-row">'+
                     '<label for="node-input-info" data-i18n="editor:workspace.info" style="width:300px;"></label>'+
@@ -196,16 +206,7 @@ RED.workspaces = (function() {
                     })
                 });
 
-                if (workspace.hasOwnProperty("disabled")) {
-                    $("#node-input-disabled").prop("checked",workspace.disabled);
-                } else {
-                    workspace.disabled = false;
-                }
-                $("#node-input-disabled").toggleButton({
-                    enabledIcon: "fa-circle-thin",
-                    disabledIcon: "fa-ban",
-                    invertState: true
-                })
+
 
                 $('<input type="text" style="display: none;" />').prependTo(dialogForm);
                 dialogForm.on("submit", function(e) { e.preventDefault();});