diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
index a0158f7..81a8f57 100644
--- a/frontend/src/App.tsx
+++ b/frontend/src/App.tsx
@@ -2421,7 +2421,16 @@ export default function App() {
       setWkEscClears(s.esc_clears_call !== false);
       setWkSendOnType(!!s.send_on_type);
       setWkEsm(!!s.esm);
-      setWkEngine(s.engine === 'icom' ? 'icom' : s.engine === 'flex' ? 'flex' : s.engine === 'serial' ? 'serial' : 'winkeyer');
+      // Every engine has to be named here. Anything unlisted silently became
+      // "winkeyer", so choosing the Yaesu keyer in the settings still gave a
+      // WinKeyer panel asking for a COM port — the setting was saved correctly,
+      // it just never survived being read back.
+      setWkEngine(
+        s.engine === 'icom' ? 'icom'
+          : s.engine === 'flex' ? 'flex'
+            : s.engine === 'yaesu' ? 'yaesu'
+              : s.engine === 'serial' ? 'serial'
+                : 'winkeyer');
     } catch { /* keyer not configured */ }
   }, []);