diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/common/popover.js b/packages/node_modules/@node-red/editor-client/src/js/ui/common/popover.js
index 472652918..f1728ed83 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/common/popover.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/common/popover.js
@@ -472,6 +472,7 @@ RED.popover = (function() {
                 action = newAction;
             }
             popover.delete = function() {
+                popover.close(true)
                 target.off("mouseenter");
                 target.off("mouseleave");
             };
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 8aa86cbea..fb4c200f5 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
@@ -421,20 +421,11 @@ RED.editor = (function() {
      * @param prefix - the prefix to use in the input element ids (node-input|node-config-input)
      */
     function attachPropertyChangeHandler(node,definition,property,prefix) {
-        var input = $("#"+prefix+"-"+property);
-        if (definition !== undefined && "format" in definition[property] && definition[property].format !== "" && input[0].nodeName === "DIV") {
-            $("#"+prefix+"-"+property).on('change keyup', function(event) {
-                if (!$(this).attr("skipValidation")) {
-                    validateNodeEditor(node,prefix);
-                }
-            });
-        } else {
-            $("#"+prefix+"-"+property).on("change", function(event) {
-                if (!$(this).attr("skipValidation")) {
-                    validateNodeEditor(node,prefix);
-                }
-            });
-        }
+        $("#"+prefix+"-"+property).on("change keyup paste", function(event) {
+            if (!$(this).attr("skipValidation")) {
+                validateNodeEditor(node,prefix);
+            }
+        });
     }
 
     /**
@@ -1066,7 +1057,7 @@ RED.editor = (function() {
                     nodeEditPanes.push('editor-tab-description');
                     removeInfoEditorOnClose = true;
                     if(node.infoEditor) {
-                        //As 'editor-tab-description' adds `node.infoEditor` store original & set a 
+                        //As 'editor-tab-description' adds `node.infoEditor` store original & set a
                         //flag to NOT remove this property
                         node.infoEditor__orig = node.infoEditor;
                         delete node.infoEditor;
@@ -1975,7 +1966,7 @@ RED.editor = (function() {
                 if (source === "node" && thing.id) {
                     id = thing.id;
                 } else if (selection.nodes && selection.nodes.length) {
-                    id = selection.nodes[0].id;  
+                    id = selection.nodes[0].id;
                 } else {
                     return false; //cant obtain Id.
                 }