diff --git a/frontend/packages/shared/src/badge/Badge.tsx b/frontend/packages/shared/src/badge/Badge.tsx
index 96fae10b..5c79976f 100644
--- a/frontend/packages/shared/src/badge/Badge.tsx
+++ b/frontend/packages/shared/src/badge/Badge.tsx
@@ -51,15 +51,27 @@ export interface BadgeProps {
   /** Decorative glyph before the label; `aria-hidden`, the text is still the real label. */
   icon?: ComponentChildren;
   /**
-   * Present → renders a `<button>` (real control, min touch target),
-   * `aria-expanded` reflecting `expanded`. Absent → renders a plain
-   * `<span>` (status display only, e.g. "alive"/"idle 6m"). No visible
-   * disclosure caret (mara: "remove the chevrons") — `hover` +
-   * `aria-expanded`'s outline/bg (Badge.css) are the only affordance.
+   * Present (or `disabled` is true — see below) → renders a `<button>`
+   * (real control, min touch target), `aria-expanded` reflecting
+   * `expanded`. Both absent → renders a plain `<span>` (status display
+   * only, e.g. "alive"/"idle 6m"). No visible disclosure caret (mara:
+   * "remove the chevrons") — `hover` + `aria-expanded`'s outline/bg
+   * (Badge.css) are the only affordance.
    */
   onClick?: (e: MouseEvent) => void;
   /** Only meaningful with `onClick` — drives `aria-expanded`. */
   expanded?: boolean;
+  /**
+   * Renders as a real `<button disabled>` even with no `onClick` —
+   * every current caller computes both off the same gating condition
+   * (`onClick={x ? fn : undefined}`, `disabled={!x}`), so `onClick`
+   * going `undefined` is exactly when this is `true`. A `disabled`
+   * badge still means "there's an action here, not right now," which
+   * is button semantics + the dimming CSS below, not a plain
+   * non-interactive span (argus, filed as its own issue —
+   * `WantedMenu`'s and `LinkMatrixAccountForm`'s trigger, both of which
+   * silently lost the dimmed affordance to this exact gap).
+   */
   disabled?: boolean;
   class?: string;
   title?: string;
@@ -77,11 +89,17 @@ export function Badge({
   class: extraClass,
   title,
 }: BadgeProps) {
+  // `disabled` alone still means "button, just not clickable right
+  // now" — see the prop's own doc above for why this can't just check
+  // `onClick`. Both the branch below and the interactive-styling class
+  // key off this one derived flag, not off `onClick` separately, so
+  // they can no longer drift apart the way they used to.
+  const interactive = Boolean(onClick) || Boolean(disabled);
   const classes = [
     "ui-badge",
     `ui-badge-${tone}`,
     variant === "quiet" && "ui-badge-quiet",
-    onClick && "ui-badge-interactive",
+    interactive && "ui-badge-interactive",
     extraClass,
   ]
     .filter(Boolean)
@@ -97,7 +115,7 @@ export function Badge({
       <span class="ui-badge-value">{value}</span>
     </>
   );
-  if (onClick) {
+  if (interactive) {
     return (
       <button
         type="button"