diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js b/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
index fb4c200f5..0ea00621e 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
@@ -1033,6 +1033,8 @@ RED.editor = (function() {
                 })
             },
             open: function(tray, done) {
+                RED.keyboard.disable();
+
                 if (editing_node.hasOwnProperty('outputs')) {
                     editing_node.__outputs = editing_node.outputs;
                 }
@@ -1075,6 +1077,8 @@ RED.editor = (function() {
                 });
             },
             close: function() {
+                RED.keyboard.enable();
+
                 if (RED.view.state() != RED.state.IMPORT_DRAGGING) {
                     RED.view.state(RED.state.DEFAULT);
                 }
@@ -1178,6 +1182,8 @@ RED.editor = (function() {
                 })
             },
             open: function(tray, done) {
+                RED.keyboard.disable();
+
                 var trayHeader = tray.find(".red-ui-tray-header");
                 var trayBody = tray.find('.red-ui-tray-body');
                 var trayFooter = tray.find(".red-ui-tray-footer");
@@ -1258,6 +1264,8 @@ RED.editor = (function() {
                 });
             },
             close: function() {
+                RED.keyboard.enable();
+
                 RED.workspaces.refresh();
 
                 activeEditPanes.forEach(function(pane) {
@@ -1635,6 +1643,8 @@ RED.editor = (function() {
                 })
             },
             open: function(tray, done) {
+                RED.keyboard.disable();
+
                 var trayFooter = tray.find(".red-ui-tray-footer");
                 var trayFooterLeft = $("<div/>", {
                     class: "red-ui-tray-footer-left"
@@ -1666,6 +1676,8 @@ RED.editor = (function() {
                 });
             },
             close: function() {
+                RED.keyboard.enable();
+
                 if (RED.view.state() != RED.state.IMPORT_DRAGGING) {
                     RED.view.state(RED.state.DEFAULT);
                 }
@@ -1755,6 +1767,8 @@ RED.editor = (function() {
                 })
             },
             open: function(tray, done) {
+                RED.keyboard.disable();
+
                 var trayFooter = tray.find(".red-ui-tray-footer");
                 var trayFooterLeft = $("<div/>", {
                     class: "red-ui-tray-footer-left"
@@ -1776,6 +1790,8 @@ RED.editor = (function() {
 
             },
             close: function() {
+                RED.keyboard.enable();
+                
                 if (RED.view.state() != RED.state.IMPORT_DRAGGING) {
                     RED.view.state(RED.state.DEFAULT);
                 }
@@ -1888,6 +1904,8 @@ RED.editor = (function() {
                 })
             },
             open: function(tray, done) {
+                RED.keyboard.disable();
+
                 var trayFooter = tray.find(".red-ui-tray-footer");
                 var trayBody = tray.find('.red-ui-tray-body');
                 trayBody.parent().css('overflow','hidden');
@@ -1915,6 +1933,8 @@ RED.editor = (function() {
                 });
             },
             close: function() {
+                RED.keyboard.enable();
+
                 if (RED.view.state() != RED.state.IMPORT_DRAGGING) {
                     RED.view.state(RED.state.DEFAULT);
                 }