diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/projects/tab-versionControl.js b/packages/node_modules/@node-red/editor-client/src/js/ui/projects/tab-versionControl.js
index 78594fa0a..33b02ef27 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/projects/tab-versionControl.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/projects/tab-versionControl.js
@@ -326,6 +326,7 @@ RED.sidebar.versionControl = (function() {
             .appendTo(bg)
             .click(function(evt) {
                 evt.preventDefault();
+                evt.stopPropagation();
                 refresh(true);
             });
         RED.popover.tooltip(refreshButton,RED._("sidebar.project.versionControl.refreshChanges"));
@@ -559,6 +560,7 @@ RED.sidebar.versionControl = (function() {
             .appendTo(bg)
             .click(function(evt) {
                 evt.preventDefault();
+                evt.stopPropagation();
                 refresh(true,true);
             })
         RED.popover.tooltip(refreshButton,RED._("sidebar.project.versionControl.refreshCommitHistory"))
diff --git a/packages/node_modules/@node-red/runtime/lib/nodes/Node.js b/packages/node_modules/@node-red/runtime/lib/nodes/Node.js
index 132709372..a0825f7b1 100644
--- a/packages/node_modules/@node-red/runtime/lib/nodes/Node.js
+++ b/packages/node_modules/@node-red/runtime/lib/nodes/Node.js
@@ -35,7 +35,10 @@ function Node(n) {
         this._alias = n._alias;
     }
     if (n._flow) {
-        this._flow = n._flow;
+        // Make this a non-enumerable property as it may cause
+        // circular references. Any existing code that tries to JSON serialise
+        // the object (such as dashboard) will not like circular refs
+        Object.defineProperty(this,'_flow', {value: n._flow, })
     }
     this.updateWires(n.wires);
 }