diff --git a/packages/wallet-webui/src/ui/DemoBanner.tsx b/packages/wallet-webui/src/ui/DemoBanner.tsx
index 4b0c92ac1..9018e4394 100644
--- a/packages/wallet-webui/src/ui/DemoBanner.tsx
+++ b/packages/wallet-webui/src/ui/DemoBanner.tsx
@@ -12,11 +12,18 @@ export function DemoBanner(props: {
   const [open, setOpen] = useState(false);
   const [confirmReset, setConfirmReset] = useState(false);
   const menuRef = useRef<HTMLDivElement>(null);
+  const triggerRef = useRef<HTMLButtonElement>(null);
 
   useEffect(() => {
     if (!open) return;
+    // Move into the menu when it opens and back to its button when it closes
+    // from the keyboard or a choice, so focus is not lost with the items.
+    menuRef.current?.querySelector<HTMLElement>('[role="menuitem"]')?.focus();
     const close = (event: KeyboardEvent) => {
-      if (event.key === "Escape") setOpen(false);
+      if (event.key !== "Escape") return;
+      if (menuRef.current?.contains(document.activeElement))
+        triggerRef.current?.focus();
+      setOpen(false);
     };
     const outside = (event: PointerEvent) => {
       if (!menuRef.current?.contains(event.target as Node)) setOpen(false);
@@ -56,6 +63,7 @@ export function DemoBanner(props: {
         )}
         <div class="relative" ref={menuRef}>
           <button
+            ref={triggerRef}
             type="button"
             aria-expanded={open}
             aria-haspopup="menu"
@@ -79,6 +87,7 @@ export function DemoBanner(props: {
                   role="menuitem"
                   onClick={() => {
                     setOpen(false);
+                    triggerRef.current?.focus();
                     props.onScenario(scenario.id);
                   }}
                   class="block w-full rounded-lg px-3 py-2 text-left font-medium hover:bg-secondaryContainer focus:outline-none focus:ring-2 focus:ring-primary"