diff --git a/web/src/components/AutopilotPanel.jsx b/web/src/components/AutopilotPanel.jsx
index 2b4f82b..24537de 100644
--- a/web/src/components/AutopilotPanel.jsx
+++ b/web/src/components/AutopilotPanel.jsx
@@ -6,19 +6,22 @@ import { num } from '../api/useXplane.js';
 // of lit mode keys, and selectors (HDG / ALT / VS / IAS) with knob steppers.
 // Buttons fire X-Plane's own autopilot commands; the sim stays the source of truth.
 
-const AP_BITS = {
-  fd: 1 << 0, hdg: 1 << 1, vs: 1 << 4, flc: 1 << 6,
-  nav: 1 << 8, apr: 1 << 9, vnav: 1 << 11, altHold: 1 << 14, bc: 1 << 18,
-};
-const on = (s, b) => (num(s) & b) !== 0;
-
+// Per-mode autopilot status (0 off · 1 armed · 2 active) — the same reliable
+// datarefs the PFD AFCS bar uses. The old approach decoded a single
+// autopilot_state bitfield, whose bit positions don't reliably match X-Plane
+// (e.g. bit 0 is auto-throttle, not the flight director), so several mode keys
+// never lit up. Reading the dedicated *_status datarefs lights every key.
 export default function AutopilotPanel({ xp }) {
   const { values: V, command, setDataref } = xp;
-  const s = num(V.apState);
-  const eng = num(V.apEngaged) > 0;
+  const lit = (k) => num(V[k]) > 0;                 // armed or active
+  const apMode = num(V.apMode);                     // 0 off · 1 FD · 2 AP
+  const eng = num(V.apEngaged) > 0 || apMode >= 2;
+  const fdOn = apMode >= 1 || eng;
 
-  const lateral = on(s, AP_BITS.apr) ? 'APR' : on(s, AP_BITS.nav) ? 'NAV' : on(s, AP_BITS.hdg) ? 'HDG' : 'ROL';
-  const vertical = on(s, AP_BITS.flc) ? 'FLC' : on(s, AP_BITS.vs) ? 'VS' : on(s, AP_BITS.vnav) ? 'VNV' : on(s, AP_BITS.altHold) ? 'ALT' : 'PIT';
+  const lateral = lit('aprStatus') ? 'APR' : lit('gpssStatus') ? 'GPS' : lit('navStatus') ? 'VOR'
+    : lit('bcStatus') ? 'BC' : lit('hdgStatus') ? 'HDG' : 'ROL';
+  const vertical = lit('gsStatus') ? 'GS' : lit('flcStatus') ? 'FLC' : lit('vsStatus') ? 'VS'
+    : lit('vnavStatus') ? 'VNV' : lit('altStatus') ? 'ALT' : 'PIT';
 
   const Key = ({ label, cmd, active }) => (
     <button className={`apk ${active ? 'on' : ''}`} onClick={() => command(cmd)}>{label}</button>
@@ -42,7 +45,7 @@ export default function AutopilotPanel({ xp }) {
         {/* annunciator bar */}
         <div className="afcs-ann">
           <span className={`ann ${eng ? 'on' : ''}`}>AP</span>
-          <span className={`ann ${on(s, AP_BITS.fd) ? 'on' : ''}`}>FD</span>
+          <span className={`ann ${fdOn ? 'on' : ''}`}>FD</span>
           <span className="ann-sep" />
           <span className="ann mode on">{lateral}</span>
           <span className="ann-gap" />
@@ -53,15 +56,15 @@ export default function AutopilotPanel({ xp }) {
         {/* mode keys */}
         <div className="afcs-keys">
           <Key label="AP" cmd="apToggle" active={eng} />
-          <Key label="FD" cmd="fdToggle" active={on(s, AP_BITS.fd)} />
-          <Key label="HDG" cmd="hdg" active={on(s, AP_BITS.hdg)} />
-          <Key label="NAV" cmd="nav" active={on(s, AP_BITS.nav)} />
-          <Key label="APR" cmd="apr" active={on(s, AP_BITS.apr)} />
-          <Key label="BC" cmd="backCourse" active={on(s, AP_BITS.bc)} />
-          <Key label="ALT" cmd="altHold" active={on(s, AP_BITS.altHold)} />
-          <Key label="VS" cmd="vs" active={on(s, AP_BITS.vs)} />
-          <Key label="VNV" cmd="vnav" active={on(s, AP_BITS.vnav)} />
-          <Key label="FLC" cmd="flc" active={on(s, AP_BITS.flc)} />
+          <Key label="FD" cmd="fdToggle" active={fdOn} />
+          <Key label="HDG" cmd="hdg" active={lit('hdgStatus')} />
+          <Key label="NAV" cmd="nav" active={lit('navStatus') || lit('gpssStatus')} />
+          <Key label="APR" cmd="apr" active={lit('aprStatus')} />
+          <Key label="BC" cmd="backCourse" active={lit('bcStatus')} />
+          <Key label="ALT" cmd="altHold" active={lit('altStatus')} />
+          <Key label="VS" cmd="vs" active={lit('vsStatus')} />
+          <Key label="VNV" cmd="vnav" active={lit('vnavStatus')} />
+          <Key label="FLC" cmd="flc" active={lit('flcStatus')} />
         </div>
 
         {/* selectors */}