diff --git a/editor/js/ui/editor.js b/editor/js/ui/editor.js
index 9b187ca04..7d353c506 100644
--- a/editor/js/ui/editor.js
+++ b/editor/js/ui/editor.js
@@ -1649,6 +1649,7 @@ RED.editor = (function() {
                 }
                 RED.sidebar.info.refresh(editing_node);
                 RED.workspaces.refresh();
+                subflowEditor.destroy();
                 editStack.pop();
                 editing_node = null;
             },
@@ -1946,6 +1947,8 @@ RED.editor = (function() {
             },
             close: function() {
                 editStack.pop();
+                expressionEditor.destroy();
+                testDataEditor.destroy();
             },
             show: function() {}
         }
@@ -2020,6 +2023,7 @@ RED.editor = (function() {
             },
             close: function() {
                 editStack.pop();
+                expressionEditor.destroy();
             },
             show: function() {}
         }
@@ -2205,6 +2209,8 @@ RED.editor = (function() {
             },
             close: function() {
                 editStack.pop();
+                bufferStringEditor.destroy();
+                bufferBinEditor.destroy();
             },
             show: function() {}
         }
diff --git a/editor/js/ui/workspaces.js b/editor/js/ui/workspaces.js
index 814fae98b..3c08e83f5 100644
--- a/editor/js/ui/workspaces.js
+++ b/editor/js/ui/workspaces.js
@@ -206,6 +206,7 @@ RED.workspaces = (function() {
                     RED.view.state(RED.state.DEFAULT);
                 }
                 RED.sidebar.info.refresh(workspace);
+                tabflowEditor.destroy();
             }
         }
         RED.tray.show(trayOptions);