diff --git a/src/tedi/components/form/checkbox/checkbox.module.scss b/src/tedi/components/form/checkbox/checkbox.module.scss
index 20e351cd..b7562273 100644
--- a/src/tedi/components/form/checkbox/checkbox.module.scss
+++ b/src/tedi/components/form/checkbox/checkbox.module.scss
@@ -6,7 +6,7 @@
 
   @include mixins.print-grayscale;
 
-  &:hover:not(.checkbox--disabled) {
+  &:hover:not(.tedi-checkbox--disabled) label {
     cursor: pointer;
   }
 
diff --git a/src/tedi/components/form/checkbox/checkbox.tsx b/src/tedi/components/form/checkbox/checkbox.tsx
index 8a0d8735..303f766d 100644
--- a/src/tedi/components/form/checkbox/checkbox.tsx
+++ b/src/tedi/components/form/checkbox/checkbox.tsx
@@ -57,7 +57,11 @@ export const Checkbox = (props: CheckboxProps): JSX.Element => {
   const LabelBEM = cn(styles['tedi-checkbox__label'], { [styles['tedi-checkbox--disabled']]: disabled });
 
   return (
-    <div data-name="check" {...rest}>
+    <div
+      className={cn(styles['tedi-checkbox'], { [styles['tedi-checkbox--disabled']]: disabled })}
+      data-name="check"
+      {...rest}
+    >
       <Row gutter={0}>
         <Col width="auto">
           <div className={styles['tedi-checkbox__outer-indicator-wrapper']}>
diff --git a/src/tedi/components/form/radio/radio.module.scss b/src/tedi/components/form/radio/radio.module.scss
index 4c4aa6cc..bca07f7d 100644
--- a/src/tedi/components/form/radio/radio.module.scss
+++ b/src/tedi/components/form/radio/radio.module.scss
@@ -6,12 +6,13 @@
 
   @include mixins.print-grayscale;
 
-  &:hover:not(.tedi-radio--disabled) {
+  &:hover:not(.tedi-radio--disabled) label {
     cursor: pointer;
   }
 
   &--disabled {
     color: var(--general-text-disabled);
+    cursor: not-allowed;
   }
 
   &__input {
diff --git a/src/tedi/components/form/radio/radio.tsx b/src/tedi/components/form/radio/radio.tsx
index 9590b8ff..d49a6cda 100644
--- a/src/tedi/components/form/radio/radio.tsx
+++ b/src/tedi/components/form/radio/radio.tsx
@@ -50,7 +50,11 @@ export const Radio = (props: RadioProps): JSX.Element => {
   const LabelBEM = cn(styles['tedi-radio__label'], { [styles['tedi-radio--disabled']]: disabled });
 
   return (
-    <div data-name="radio" {...rest}>
+    <div
+      className={cn(styles['tedi-radio'], { [styles['tedi-radio--disabled']]: disabled })}
+      data-name="radio"
+      {...rest}
+    >
       <Row gutter={0}>
         <Col width="auto">
           <div className={styles['tedi-radio__outer-indicator-wrapper']}>