diff --git a/pkgs/clan-app/ui/src/components/Form/Fieldset.css b/pkgs/clan-app/ui/src/components/Form/Fieldset.css
index f0a3cd5a7..382f4182a 100644
--- a/pkgs/clan-app/ui/src/components/Form/Fieldset.css
+++ b/pkgs/clan-app/ui/src/components/Form/Fieldset.css
@@ -1,4 +1,4 @@
-fieldset {
+.fieldset {
   @apply flex flex-col w-full;
 
   legend {
diff --git a/pkgs/clan-app/ui/src/components/Form/Fieldset.tsx b/pkgs/clan-app/ui/src/components/Form/Fieldset.tsx
index cb09953c5..0c4b2bd32 100644
--- a/pkgs/clan-app/ui/src/components/Form/Fieldset.tsx
+++ b/pkgs/clan-app/ui/src/components/Form/Fieldset.tsx
@@ -35,10 +35,10 @@ export const Fieldset = (props: FieldsetProps) => {
       : props.children;
 
   return (
-    <fieldset
+    <div
       role="group"
-      class={cx({ inverted: props.inverted })}
-      disabled={props.disabled || false}
+      class={cx("fieldset", { inverted: props.inverted })}
+      aria-disabled={props.disabled || undefined}
     >
       {props.legend && (
         <legend>
@@ -69,6 +69,6 @@ export const Fieldset = (props: FieldsetProps) => {
           </Typography>
         </div>
       )}
-    </fieldset>
+    </div>
   );
 };