diff --git a/app/src/lib/graph-interface/graph/mouse.events.ts b/app/src/lib/graph-interface/graph/mouse.events.ts
index 935c784..336fd1f 100644
--- a/app/src/lib/graph-interface/graph/mouse.events.ts
+++ b/app/src/lib/graph-interface/graph/mouse.events.ts
@@ -189,6 +189,10 @@ export class MouseEventManager {
 
     // if we clicked on a node
     if (clickedNodeId !== -1) {
+      if (event.ctrlKey && event.shiftKey) {
+        this.state.tryConnectToDebugNode(clickedNodeId);
+        return;
+      }
       if (this.state.activeNodeId === -1) {
         this.state.activeNodeId = clickedNodeId;
         // if the selected node is the same as the clicked node
@@ -222,10 +226,6 @@ export class MouseEventManager {
       this.state.boxSelection = true;
     }
 
-    if (event.ctrlKey && event.shiftKey && this.state.activeNodeId !== -1) {
-      this.state.tryConnectToDebugNode(this.state.activeNodeId);
-    }
-
     const node = this.graph.getNode(this.state.activeNodeId);
     if (!node) return;
     node.state = node.state || {};