diff --git a/src/lib/components/common/ConfirmDialog.svelte b/src/lib/components/common/ConfirmDialog.svelte
index c2273c992..bdde958ca 100644
--- a/src/lib/components/common/ConfirmDialog.svelte
+++ b/src/lib/components/common/ConfirmDialog.svelte
@@ -46,6 +46,8 @@
 
 		if (event.key === 'Enter') {
 			console.log('Enter');
+			event.preventDefault();
+			event.stopPropagation();
 			confirmHandler();
 		}
 	};
@@ -81,6 +83,7 @@
 
 	onDestroy(() => {
 		show = false;
+		window.removeEventListener('keydown', handleKeyDown);
 		if (focusTrap) {
 			focusTrap.deactivate();
 		}