diff --git a/frontend/src/lib/components/CommentThread.svelte b/frontend/src/lib/components/CommentThread.svelte
index 8725bd09..c4b78747 100644
--- a/frontend/src/lib/components/CommentThread.svelte
+++ b/frontend/src/lib/components/CommentThread.svelte
@@ -169,6 +169,7 @@ function handleEditKeydown(e: KeyboardEvent, commentId: string) {
 		e.preventDefault();
 		saveEdit(commentId);
 	} else if (e.key === 'Escape') {
+		e.stopPropagation();
 		cancelEdit();
 	}
 }