diff --git a/codex-cli/src/utils/agent/apply-patch.ts b/codex-cli/src/utils/agent/apply-patch.ts
index 9638ccf0..525404c3 100644
--- a/codex-cli/src/utils/agent/apply-patch.ts
+++ b/codex-cli/src/utils/agent/apply-patch.ts
@@ -390,9 +390,10 @@ function find_context_core(
     return [start, 0];
   }
   // Pass 1 – exact equality after canonicalisation ---------------------------
+  const canonicalContext = canon(context.join("\n"));
   for (let i = start; i < lines.length; i++) {
     const segment = canon(lines.slice(i, i + context.length).join("\n"));
-    if (segment === canon(context.join("\n"))) {
+    if (segment === canonicalContext) {
       return [i, 0];
     }
   }