diff --git a/packages/wallet-webui/src/ui/OverflowMenu.tsx b/packages/wallet-webui/src/ui/OverflowMenu.tsx
index 54fb5d93c..84b872dd0 100644
--- a/packages/wallet-webui/src/ui/OverflowMenu.tsx
+++ b/packages/wallet-webui/src/ui/OverflowMenu.tsx
@@ -12,11 +12,20 @@ export function OverflowMenu(props: {
 }) {
   const [open, setOpen] = useState(false);
   const container = useRef<HTMLDivElement>(null);
+  const trigger = useRef<HTMLButtonElement>(null);
+  const menu = useRef<HTMLDivElement>(null);
 
   useEffect(() => {
     if (!open) return;
+    // A menu takes focus when it opens and hands it back to its button when
+    // it closes from the keyboard or a choice, so focus is never lost with
+    // the removed items.
+    menu.current?.querySelector<HTMLElement>('[role="menuitem"]')?.focus();
     const closeOnEscape = (event: KeyboardEvent) => {
-      if (event.key === "Escape") setOpen(false);
+      if (event.key !== "Escape") return;
+      if (menu.current?.contains(document.activeElement))
+        trigger.current?.focus();
+      setOpen(false);
     };
     const closeOutside = (event: PointerEvent) => {
       if (!container.current?.contains(event.target as Node)) setOpen(false);
@@ -32,6 +41,7 @@ export function OverflowMenu(props: {
   return (
     <div class="relative shrink-0" ref={container}>
       <button
+        ref={trigger}
         type="button"
         aria-label={props.label}
         aria-haspopup="menu"
@@ -43,6 +53,7 @@ export function OverflowMenu(props: {
       </button>
       {open && (
         <div
+          ref={menu}
           role="menu"
           aria-label={props.label}
           class="absolute right-0 z-10 mt-1 min-w-48 rounded-xl border border-outlineVariant bg-surface p-1 shadow-lg"
@@ -54,6 +65,7 @@ export function OverflowMenu(props: {
               role="menuitem"
               onClick={() => {
                 setOpen(false);
+                trigger.current?.focus();
                 item.onSelect();
               }}
               class="min-h-11 w-full rounded-lg px-3 py-2 text-left text-sm font-semibold text-primary hover:bg-primaryContainer focus:outline-none focus:ring-2 focus:ring-primary"