diff --git a/src/components/FieldSetWithStatus.tsx b/src/components/FieldSetWithStatus.tsx
index 3f2bd4ab..19e7ab01 100644
--- a/src/components/FieldSetWithStatus.tsx
+++ b/src/components/FieldSetWithStatus.tsx
@@ -93,6 +93,7 @@ export default function FieldSetWithStatus({
         </select>
         : tagOptions
           ? <TagInput
+            id={id}
             name={id}
             value={value}
             options={tagOptions}
diff --git a/src/components/TagInput.tsx b/src/components/TagInput.tsx
index 934820eb..d713f72d 100644
--- a/src/components/TagInput.tsx
+++ b/src/components/TagInput.tsx
@@ -10,6 +10,7 @@ const ARIA_ID_TAG_CONTROL = 'tag-control';
 const ARIA_ID_TAG_OPTIONS = 'tag-options';
 
 export default function TagInput({
+  id,
   name,
   value = '',
   options = [],
@@ -17,6 +18,7 @@ export default function TagInput({
   className,
   readOnly,
 }: {
+  id?: string
   name: string
   value?: string
   options?: AnnotatedTag[]
@@ -249,6 +251,7 @@ export default function TagInput({
               {option}
             </span>)}
         <input
+          id={id}
           ref={inputRef}
           type="text"
           className={clsx(