diff --git a/editor/js/ui/editor.js b/editor/js/ui/editor.js
index c87f27850..c5749e752 100644
--- a/editor/js/ui/editor.js
+++ b/editor/js/ui/editor.js
@@ -562,10 +562,8 @@ RED.editor = (function() {
             ],
             resize: function() {
                 if (editing_node && editing_node._def.oneditresize) {
-                    setTimeout(function() {
-                        var form = $("#dialog-form");
-                        editing_node._def.oneditresize.call(editing_node,{width:form.width(),height:form.height()});
-                    },0);
+                    var form = $("#dialog-form");
+                    editing_node._def.oneditresize.call(editing_node,{width:form.width(),height:form.height()});
                 }
             },
             open: function(tray) {
@@ -698,10 +696,8 @@ RED.editor = (function() {
             title: (adding?RED._("editor.addNewConfig", {type:type}):RED._("editor.editConfig", {type:type})),
             resize: function() {
                 if (editing_config_node && editing_config_node._def.oneditresize) {
-                    setTimeout(function() {
-                        var form = $("#node-config-dialog-edit-form");
-                        editing_config_node._def.oneditresize.call(editing_config_node,{width:form.width(),height:form.height()});
-                    },0);
+                    var form = $("#node-config-dialog-edit-form");
+                    editing_config_node._def.oneditresize.call(editing_config_node,{width:form.width(),height:form.height()});
                 }
             },
             open: function(tray) {
@@ -1071,17 +1067,15 @@ RED.editor = (function() {
                 }
             ],
             resize: function() {
-                setTimeout(function() {
-                    var rows = $("#dialog-form>div:not(.node-text-editor-row)");
-                    var editorRow = $("#dialog-form>div.node-text-editor-row");
-                    var height = $("#dialog-form").height();
-                    for (var i=0;i<rows.size();i++) {
-                        height -= $(rows[i]).outerHeight(true);
-                    }
-                    height -= (parseInt($("#dialog-form").css("marginTop"))+parseInt($("#dialog-form").css("marginBottom")));
-                    $(".node-text-editor").css("height",height+"px");
-                    subflowEditor.resize();
-                },0);
+                var rows = $("#dialog-form>div:not(.node-text-editor-row)");
+                var editorRow = $("#dialog-form>div.node-text-editor-row");
+                var height = $("#dialog-form").height();
+                for (var i=0;i<rows.size();i++) {
+                    height -= $(rows[i]).outerHeight(true);
+                }
+                height -= (parseInt($("#dialog-form").css("marginTop"))+parseInt($("#dialog-form").css("marginBottom")));
+                $(".node-text-editor").css("height",height+"px");
+                subflowEditor.resize();
             },
             open: function(tray) {
                 if (editing_node) {
diff --git a/editor/js/ui/tray.js b/editor/js/ui/tray.js
index 40275e0c0..d6943d4c2 100644
--- a/editor/js/ui/tray.js
+++ b/editor/js/ui/tray.js
@@ -66,16 +66,18 @@ RED.tray = (function() {
 
         stack.push(tray);
 
-        setTimeout(function() {
-            var trayHeight = el.height()-header.outerHeight()-footer.outerHeight();
-            body.height(trayHeight-40);
+        var trayHeight = el.height()-header.outerHeight()-footer.outerHeight();
+        body.height(trayHeight-40);
 
-            if (options.resize) {
-                options.resize();
-            }
-            if (options.show) {
-                options.show();
-            }
+        setTimeout(function() {
+            setTimeout(function() {
+                if (options.resize) {
+                    options.resize();
+                }
+                if (options.show) {
+                    options.show();
+                }
+            },150);
             el.css({right:0});
         },0);
     }
diff --git a/editor/templates/index.mst b/editor/templates/index.mst
index 8813e21fd..da94c52c6 100644
--- a/editor/templates/index.mst
+++ b/editor/templates/index.mst
@@ -67,18 +67,7 @@
         </div>
     </div>
     <div id="editor-shade" class="hide"></div>
-    <div id="editor-stack">
-<!--
-        <div class="workspace-tray-header"></div>
-        <div class="workspace-tray-body">
-            <form id="dialog-form" class="form-horizontal"></form>
-        </div>
-        <div class="workspace-tray-footer">
-            <button type="button" id="node-dialog-ok">Ok</button>
-            <button type="button" id="node-dialog-cancel">Cancel</button>
-        </div>
-    -->
-    </div>
+    <div id="editor-stack"></div>
     <div id="sidebar">
         <ul id="sidebar-tabs"></ul>
         <div id="sidebar-content"></div>
@@ -92,9 +81,6 @@
 <div id="notifications"></div>
 <div id="dropTarget"><div data-i18n="[append]workspace.dropFlowHere"><br/><i class="fa fa-download"></i></div></div>
 
-<div id="dialog-REMOVE" class="hide"><form id="dialog-form2" class="form-horizontal"></form></div>
-<div id="node-config-dialog-REMOVE" class="hide"><form id="dialog-config-form" class="form-horizontal"><div id="node-config-dialog-edit-form"></div><!--<div id="node-config-dialog-toolbar" class="form-row"><label><span>Node scope</span></label><select id="node-config-dialog-scope"></select></div>--></form></div>
-
 <div id="node-dialog-confirm-deploy" class="hide">
     <form class="form-horizontal">
         <div id="node-dialog-confirm-deploy-config" style="text-align: left; padding-top: 30px;" data-i18n="[prepend]deploy.confirm.improperlyConfigured;[append]deploy.confirm.confirm">