diff --git a/src/components/CheckboxInput/CheckboxInput.tsx b/src/components/CheckboxInput/CheckboxInput.tsx
index 72e90448..7076aa0d 100644
--- a/src/components/CheckboxInput/CheckboxInput.tsx
+++ b/src/components/CheckboxInput/CheckboxInput.tsx
@@ -43,7 +43,9 @@ const CheckboxInput = ({
   return (
     <Field
       caution={caution}
-      className={classnames(className, { "p-checkbox--inline": inline })}
+      className={classnames("p-checkbox-wrapper", className, {
+        "p-checkbox--inline": inline,
+      })}
       error={error}
       forId={inputId}
       help={help}
diff --git a/src/components/RadioInput/RadioInput.tsx b/src/components/RadioInput/RadioInput.tsx
index 207cd013..dd55d718 100644
--- a/src/components/RadioInput/RadioInput.tsx
+++ b/src/components/RadioInput/RadioInput.tsx
@@ -43,7 +43,9 @@ const RadioInput = ({
   return (
     <Field
       caution={caution}
-      className={classnames(className, { "p-radio--inline": inline })}
+      className={classnames("p-radio-wrapper", className, {
+        "p-radio--inline": inline,
+      })}
       error={error}
       forId={inputId}
       help={help}