diff --git a/frontend/src/lib/components/graph/FlowGraphV2.svelte b/frontend/src/lib/components/graph/FlowGraphV2.svelte
index 93901cff0e..16b5fe73ce 100644
--- a/frontend/src/lib/components/graph/FlowGraphV2.svelte
+++ b/frontend/src/lib/components/graph/FlowGraphV2.svelte
@@ -755,7 +755,6 @@
 					if (selectionManager.mode === 'normal') {
 						selectionManager.clearSelection()
 					}
-					noteManager.clearNoteSelection()
 				}}
 				onpanecontextmenu={({ event }) => {
 					paneContextMenu?.onPaneContextMenu(event)
diff --git a/frontend/src/lib/components/graph/renderers/nodes/NoteNode.svelte b/frontend/src/lib/components/graph/renderers/nodes/NoteNode.svelte
index 641a41979d..b4e1d03aa7 100644
--- a/frontend/src/lib/components/graph/renderers/nodes/NoteNode.svelte
+++ b/frontend/src/lib/components/graph/renderers/nodes/NoteNode.svelte
@@ -15,6 +15,7 @@
 	import { Button } from '$lib/components/common'
 	import { getNoteEditorContext } from '../../noteEditor.svelte'
 	import { getGraphContext } from '../../graphContext'
+	import { clickOutside } from '$lib/utils'
 
 	interface Props {
 		data: {
@@ -171,6 +172,11 @@
 	role="button"
 	tabindex={editMode ? -1 : 0}
 	ondblclick={handleDoubleClick}
+	use:clickOutside={{
+		onClickOutside: () => {
+			noteManager?.clearNoteSelection()
+		}
+	}}
 >
 	<!-- Action buttons - only show in edit mode -->
 	{#if isEditModeAvailable}