diff --git a/frontend/src/lib/components/common/confirmationModal/ConfirmationModal.svelte b/frontend/src/lib/components/common/confirmationModal/ConfirmationModal.svelte
index 25d7c3bc68..461ebd61fd 100644
--- a/frontend/src/lib/components/common/confirmationModal/ConfirmationModal.svelte
+++ b/frontend/src/lib/components/common/confirmationModal/ConfirmationModal.svelte
@@ -17,6 +17,7 @@
 	function onKeyDown(event: KeyboardEvent) {
 		if (open) {
 			event.stopPropagation()
+			event.preventDefault()
 			switch (event.key) {
 				case 'Enter':
 					dispatch('confirmed')
diff --git a/frontend/src/lib/components/flows/map/FlowModuleSchemaMap.svelte b/frontend/src/lib/components/flows/map/FlowModuleSchemaMap.svelte
index c6af024056..fb4178bb41 100644
--- a/frontend/src/lib/components/flows/map/FlowModuleSchemaMap.svelte
+++ b/frontend/src/lib/components/flows/map/FlowModuleSchemaMap.svelte
@@ -24,7 +24,7 @@
 	export let modules: FlowModule[] | undefined
 
 	let indexToRemove: number | undefined = undefined
-	const { select } = getContext<FlowEditorContext>('FlowEditorContext')
+	const { select, selectedId } = getContext<FlowEditorContext>('FlowEditorContext')
 
 	async function insertNewModuleAtIndex(
 		index: number,
@@ -156,5 +156,6 @@
 			removeAtIndex(indexToRemove)
 			indexToRemove = undefined
 		}
+		$selectedId = 'settings-graph'
 	}}
 />