diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
index 81a8f57..c72be25 100644
--- a/frontend/src/App.tsx
+++ b/frontend/src/App.tsx
@@ -2556,7 +2556,7 @@ export default function App() {
     // segment AFTER the <LOGQSO> (which logs and clears the form) still expands its
     // variables correctly.
     const parts = rawText.split(/<LOGQSO>/i).map((pt) => resolveCW(pt));
-    const isRig = cwSourceRef.current === 'icom' || cwSourceRef.current === 'flex';
+    const isRig = cwSourceRef.current === 'icom' || cwSourceRef.current === 'flex' || cwSourceRef.current === 'yaesu';
     for (let p = 0; p < parts.length; p++) {
       if (aborted()) return; // ESC / Stop before this segment → stop sending, don't log
       const resolved = parts[p];
@@ -5222,8 +5222,16 @@ export default function App() {
           {wkEnabled && (
             <div className="w-[380px] shrink-0 min-h-0">
               <WinkeyerPanel
-                status={cwSource === 'icom' || cwSource === 'flex'
-                  ? { connected: catState.backend === cwSource && catState.connected, busy: false, wpm: wkWpm, version: 0, port: cwSource === 'flex' ? 'CWX' : 'CI-V' }
+                // A rig keyer has no serial status of its own: it is connected
+                // exactly when its CAT backend is. Yaesu was missing from this
+                // list, so the panel fell back to the WinKeyer status — which
+                // reported disconnected, no WinKeyer being attached.
+                status={cwSource === 'icom' || cwSource === 'flex' || cwSource === 'yaesu'
+                  ? {
+                    connected: catState.backend === cwSource && catState.connected,
+                    busy: false, wpm: wkWpm, version: 0,
+                    port: cwSource === 'flex' ? 'CWX' : cwSource === 'yaesu' ? 'CAT' : 'CI-V',
+                  }
                   : wkStatus}
                 ports={wkPorts}
                 port={wkPort}