diff --git a/public/red/ui/view.js b/public/red/ui/view.js
index 67ae059ad..264a4597d 100644
--- a/public/red/ui/view.js
+++ b/public/red/ui/view.js
@@ -695,8 +695,9 @@ RED.view = function() {
     }
 
     function nodeMouseUp(d) {
-        if (clickElapsed > 0 && clickElapsed < 300) {
+        if (mousedown_node == d && clickElapsed > 0 && clickElapsed < 300) {
             RED.editor.edit(d);
+            clickElapsed = 0;
             return;
         }
         portMouseUp(d, d._def.inputs > 0 ? 1 : 0, 0);