diff --git a/packages/components/src/components/checkbox/checkbox.ts b/packages/components/src/components/checkbox/checkbox.ts
index 8b7a11832..9fa772ee9 100644
--- a/packages/components/src/components/checkbox/checkbox.ts
+++ b/packages/components/src/components/checkbox/checkbox.ts
@@ -227,7 +227,7 @@ export default class SdCheckbox extends SolidElement implements SolidFormControl
             ? ' control--indeterminate'
             : ''}"
           class=${cx(
-            `relative flex flex-initial items-center justify-center border rounded-sm h-4 w-4
+            `relative flex flex-shrink-0 items-center justify-center border rounded-sm h-4 w-4
             peer-focus-visible:outline peer-focus-visible:outline-2 peer-focus-visible:outline-offset-2
             peer-focus-visible:outline-primary`,
             {
diff --git a/packages/components/src/components/option/option.ts b/packages/components/src/components/option/option.ts
index d1cf50edc..bd704ffb4 100644
--- a/packages/components/src/components/option/option.ts
+++ b/packages/components/src/components/option/option.ts
@@ -157,7 +157,7 @@ export default class SdOption extends SolidElement {
               id="control"
               part="control ${this.selected ? ' control--checked' : 'control--unchecked'}"
               class=${cx(
-                'relative flex flex-initial items-center justify-center border rounded-sm h-4 w-4 mr-2',
+                'relative flex flex-shrink-0 items-center justify-center border rounded-sm h-4 w-4 mr-2',
                 this.disabled ? 'border-neutral-500' : this.selected ? 'bg-accent border-accent' : 'border-neutral-800'
               )}
             >