diff --git a/frontend/app/trees/[id]/persons/[personId]/page.tsx b/frontend/app/trees/[id]/persons/[personId]/page.tsx
index 2278492..8c0bad2 100644
--- a/frontend/app/trees/[id]/persons/[personId]/page.tsx
+++ b/frontend/app/trees/[id]/persons/[personId]/page.tsx
@@ -1060,18 +1060,12 @@ export default function PersonDetailPage() {
             {isPartnershipType(evType) && (
               <label className="flex flex-col gap-1">
                 <span className="text-xs text-[var(--muted)]">Spouse / partner</span>
-                <select
-                  className={fieldCls}
+                <PersonCombobox
+                  people={others}
                   value={evSpouse}
-                  onChange={(e) => setEvSpouse(e.target.value)}
-                >
-                  <option value="">— choose —</option>
-                  {others.map((p) => (
-                    <option key={p.id} value={p.id}>
-                      {p.primary_name ?? "Unnamed"}
-                    </option>
-                  ))}
-                </select>
+                  onChange={setEvSpouse}
+                  placeholder="Search for a spouse…"
+                />
               </label>
             )}
             <label className="flex flex-col gap-1">