diff --git a/packages/frontend/editor-ui/src/components/canvas/elements/handles/render-types/parts/CanvasHandlePlus.vue b/packages/frontend/editor-ui/src/components/canvas/elements/handles/render-types/parts/CanvasHandlePlus.vue
index 4d28d57417..163835d4f5 100644
--- a/packages/frontend/editor-ui/src/components/canvas/elements/handles/render-types/parts/CanvasHandlePlus.vue
+++ b/packages/frontend/editor-ui/src/components/canvas/elements/handles/render-types/parts/CanvasHandlePlus.vue
@@ -25,6 +25,7 @@ const emit = defineEmits<{
 const style = useCssModule();
 
 const classes = computed(() => [
+	'canvas-handle-plus-wrapper',
 	style.wrapper,
 	style[props.position],
 	style[props.type],
diff --git a/packages/frontend/editor-ui/src/components/canvas/elements/handles/render-types/parts/__snapshots__/CanvasHandlePlus.test.ts.snap b/packages/frontend/editor-ui/src/components/canvas/elements/handles/render-types/parts/__snapshots__/CanvasHandlePlus.test.ts.snap
index 681be89f62..ecae02b4b7 100644
--- a/packages/frontend/editor-ui/src/components/canvas/elements/handles/render-types/parts/__snapshots__/CanvasHandlePlus.test.ts.snap
+++ b/packages/frontend/editor-ui/src/components/canvas/elements/handles/render-types/parts/__snapshots__/CanvasHandlePlus.test.ts.snap
@@ -1,7 +1,7 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`CanvasHandlePlus > should render with default props 1`] = `
-"<svg data-test-id="canvas-handle-plus-wrapper" class="wrapper right default" viewBox="0 0 70 24" style="width: 70px; height: 24px;">
+"<svg data-test-id="canvas-handle-plus-wrapper" class="canvas-handle-plus-wrapper wrapper right default" viewBox="0 0 70 24" style="width: 70px; height: 24px;">
   <line class="line" x1="0" y1="12" x2="47" y2="12" stroke="var(--color-foreground-xdark)" stroke-width="2"></line>
   <g data-test-id="canvas-handle-plus" class="plus clickable" transform="translate(46, 0)">
     <rect class="clickable" x="2" y="2" width="20" height="20" stroke="var(--color-foreground-xdark)" stroke-width="2" rx="4" fill="var(--color-foreground-xlight)"></rect>
diff --git a/packages/frontend/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeDefault.vue b/packages/frontend/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeDefault.vue
index 8cd98f35db..781233673a 100644
--- a/packages/frontend/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeDefault.vue
+++ b/packages/frontend/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeDefault.vue
@@ -313,6 +313,7 @@ function onActivate(event: MouseEvent) {
 	display: flex;
 	flex-direction: column;
 	gap: var(--spacing-4xs);
+	pointer-events: none;
 }
 
 .label,
diff --git a/packages/frontend/editor-ui/src/styles/plugins/_vueflow.scss b/packages/frontend/editor-ui/src/styles/plugins/_vueflow.scss
index 7d8a7e84ae..7e40aebb80 100644
--- a/packages/frontend/editor-ui/src/styles/plugins/_vueflow.scss
+++ b/packages/frontend/editor-ui/src/styles/plugins/_vueflow.scss
@@ -79,6 +79,11 @@
 	&:has(.sticky--active) {
 		z-index: 1 !important;
 	}
+
+	// Bump z-index for unconnected nodes
+	&:has(.canvas-handle-plus-wrapper):hover {
+		z-index: 2 !important;
+	}
 }
 
 .vue-flow__nodes:has(.bring-to-front) {