diff --git a/extension/src/popup/components/types/card.ts b/extension/src/popup/components/types/card.ts
index 2c85038..400fc92 100644
--- a/extension/src/popup/components/types/card.ts
+++ b/extension/src/popup/components/types/card.ts
@@ -10,12 +10,17 @@ import {
 const CARD_KINDS: CardKind[] = ['credit', 'debit', 'gift', 'loyalty', 'other'];
 
 let activeKeyHandler: ((e: KeyboardEvent) => void) | null = null;
+let activeFormEscHandler: ((e: KeyboardEvent) => void) | null = null;
 
 export function teardown(): void {
   if (activeKeyHandler) {
     document.removeEventListener('keydown', activeKeyHandler);
     activeKeyHandler = null;
   }
+  if (activeFormEscHandler) {
+    document.removeEventListener('keydown', activeFormEscHandler);
+    activeFormEscHandler = null;
+  }
 }
 
 function brandFromNumber(num: string): string {
@@ -187,11 +192,11 @@ export function renderForm(app: HTMLElement, mode: 'add' | 'edit', existing: Ite
 
   const escHandler = (e: KeyboardEvent) => {
     if (e.key === 'Escape') {
-      document.removeEventListener('keydown', escHandler);
       setState({ error: null });
       navigate(mode === 'edit' ? 'detail' : 'list');
     }
   };
+  activeFormEscHandler = escHandler;
   document.addEventListener('keydown', escHandler);
 
   (document.getElementById('f-title') as HTMLInputElement | null)?.focus();
diff --git a/extension/src/popup/components/types/identity.ts b/extension/src/popup/components/types/identity.ts
index 52e211d..1cafa75 100644
--- a/extension/src/popup/components/types/identity.ts
+++ b/extension/src/popup/components/types/identity.ts
@@ -8,12 +8,17 @@ import {
 } from '../fields';
 
 let activeKeyHandler: ((e: KeyboardEvent) => void) | null = null;
+let activeFormEscHandler: ((e: KeyboardEvent) => void) | null = null;
 
 export function teardown(): void {
   if (activeKeyHandler) {
     document.removeEventListener('keydown', activeKeyHandler);
     activeKeyHandler = null;
   }
+  if (activeFormEscHandler) {
+    document.removeEventListener('keydown', activeFormEscHandler);
+    activeFormEscHandler = null;
+  }
 }
 
 function initials(name: string | undefined): string {
@@ -142,11 +147,11 @@ export function renderForm(app: HTMLElement, mode: 'add' | 'edit', existing: Ite
 
   const escHandler = (e: KeyboardEvent) => {
     if (e.key === 'Escape') {
-      document.removeEventListener('keydown', escHandler);
       setState({ error: null });
       navigate(mode === 'edit' ? 'detail' : 'list');
     }
   };
+  activeFormEscHandler = escHandler;
   document.addEventListener('keydown', escHandler);
 
   (document.getElementById('f-title') as HTMLInputElement | null)?.focus();
diff --git a/extension/src/popup/components/types/key.ts b/extension/src/popup/components/types/key.ts
index e45d7ff..8bdf334 100644
--- a/extension/src/popup/components/types/key.ts
+++ b/extension/src/popup/components/types/key.ts
@@ -9,12 +9,17 @@ import {
 } from '../fields';
 
 let activeKeyHandler: ((e: KeyboardEvent) => void) | null = null;
+let activeFormEscHandler: ((e: KeyboardEvent) => void) | null = null;
 
 export function teardown(): void {
   if (activeKeyHandler) {
     document.removeEventListener('keydown', activeKeyHandler);
     activeKeyHandler = null;
   }
+  if (activeFormEscHandler) {
+    document.removeEventListener('keydown', activeFormEscHandler);
+    activeFormEscHandler = null;
+  }
 }
 
 export async function renderDetail(app: HTMLElement, item: Item): Promise<void> {
@@ -141,11 +146,11 @@ export function renderForm(app: HTMLElement, mode: 'add' | 'edit', existing: Ite
 
   const escHandler = (e: KeyboardEvent) => {
     if (e.key === 'Escape') {
-      document.removeEventListener('keydown', escHandler);
       setState({ error: null });
       navigate(mode === 'edit' ? 'detail' : 'list');
     }
   };
+  activeFormEscHandler = escHandler;
   document.addEventListener('keydown', escHandler);
 
   (document.getElementById('f-title') as HTMLInputElement | null)?.focus();
diff --git a/extension/src/popup/components/types/login.ts b/extension/src/popup/components/types/login.ts
index 90a291e..c529a39 100644
--- a/extension/src/popup/components/types/login.ts
+++ b/extension/src/popup/components/types/login.ts
@@ -20,6 +20,10 @@ export function teardown(): void {
     document.removeEventListener('keydown', activeKeyHandler);
     activeKeyHandler = null;
   }
+  if (activeFormEscHandler) {
+    document.removeEventListener('keydown', activeFormEscHandler);
+    activeFormEscHandler = null;
+  }
 }
 
 // ----------------------------------------------------------------------
@@ -174,6 +178,7 @@ export async function renderDetail(app: HTMLElement, item: Item): Promise<void>
 
 let totpTickerId: ReturnType<typeof setInterval> | null = null;
 let activeKeyHandler: ((e: KeyboardEvent) => void) | null = null;
+let activeFormEscHandler: ((e: KeyboardEvent) => void) | null = null;
 function stopTotpTicker(): void {
   if (totpTickerId !== null) { clearInterval(totpTickerId); totpTickerId = null; }
 }
@@ -259,11 +264,11 @@ export function renderForm(app: HTMLElement, mode: 'add' | 'edit', existing: Ite
 
   const escHandler = (e: KeyboardEvent) => {
     if (e.key === 'Escape') {
-      document.removeEventListener('keydown', escHandler);
       setState({ error: null });
       navigate(mode === 'edit' ? 'detail' : 'list');
     }
   };
+  activeFormEscHandler = escHandler;
   document.addEventListener('keydown', escHandler);
 
   (document.getElementById('f-title') as HTMLInputElement | null)?.focus();
diff --git a/extension/src/popup/components/types/secure-note.ts b/extension/src/popup/components/types/secure-note.ts
index ace0a50..8939375 100644
--- a/extension/src/popup/components/types/secure-note.ts
+++ b/extension/src/popup/components/types/secure-note.ts
@@ -8,12 +8,17 @@ import {
 } from '../fields';
 
 let activeKeyHandler: ((e: KeyboardEvent) => void) | null = null;
+let activeFormEscHandler: ((e: KeyboardEvent) => void) | null = null;
 
 export function teardown(): void {
   if (activeKeyHandler) {
     document.removeEventListener('keydown', activeKeyHandler);
     activeKeyHandler = null;
   }
+  if (activeFormEscHandler) {
+    document.removeEventListener('keydown', activeFormEscHandler);
+    activeFormEscHandler = null;
+  }
 }
 
 export async function renderDetail(app: HTMLElement, item: Item): Promise<void> {
@@ -112,11 +117,11 @@ export function renderForm(app: HTMLElement, mode: 'add' | 'edit', existing: Ite
 
   const escHandler = (e: KeyboardEvent) => {
     if (e.key === 'Escape') {
-      document.removeEventListener('keydown', escHandler);
       setState({ error: null });
       navigate(mode === 'edit' ? 'detail' : 'list');
     }
   };
+  activeFormEscHandler = escHandler;
   document.addEventListener('keydown', escHandler);
 
   (document.getElementById('f-title') as HTMLInputElement | null)?.focus();
diff --git a/extension/src/popup/components/types/totp.ts b/extension/src/popup/components/types/totp.ts
index 5649596..f897e56 100644
--- a/extension/src/popup/components/types/totp.ts
+++ b/extension/src/popup/components/types/totp.ts
@@ -15,6 +15,7 @@ import {
 
 let totpTickerId: ReturnType<typeof setInterval> | null = null;
 let activeKeyHandler: ((e: KeyboardEvent) => void) | null = null;
+let activeFormEscHandler: ((e: KeyboardEvent) => void) | null = null;
 
 function stopTotpTicker(): void {
   if (totpTickerId !== null) { clearInterval(totpTickerId); totpTickerId = null; }
@@ -28,6 +29,10 @@ export function teardown(): void {
     document.removeEventListener('keydown', activeKeyHandler);
     activeKeyHandler = null;
   }
+  if (activeFormEscHandler) {
+    document.removeEventListener('keydown', activeFormEscHandler);
+    activeFormEscHandler = null;
+  }
 }
 
 // ----------------------------------------------------------------------
@@ -248,11 +253,11 @@ export function renderForm(app: HTMLElement, mode: 'add' | 'edit', existing: Ite
 
   const escHandler = (e: KeyboardEvent) => {
     if (e.key === 'Escape') {
-      document.removeEventListener('keydown', escHandler);
       setState({ error: null });
       navigate(mode === 'edit' ? 'detail' : 'list');
     }
   };
+  activeFormEscHandler = escHandler;
   document.addEventListener('keydown', escHandler);
 
   (document.getElementById('f-title') as HTMLInputElement | null)?.focus();