diff --git a/MVMCoreUI/Atomic/Atoms/Selectors/RadioBoxesModel.swift b/MVMCoreUI/Atomic/Atoms/Selectors/RadioBoxesModel.swift
index 9ed15051..c85310b0 100644
--- a/MVMCoreUI/Atomic/Atoms/Selectors/RadioBoxesModel.swift
+++ b/MVMCoreUI/Atomic/Atoms/Selectors/RadioBoxesModel.swift
@@ -81,7 +81,7 @@ extension Array where Element == RadioBoxModel {
             radioBox.surface = surface
             radioBox.selected = item.selected
             radioBox.strikethrough = item.strikethrough
-            radioBox.disabled = !item.isEnabled
+            radioBox.enabled = item.isEnabled
             return radioBox
         })
     }
diff --git a/MVMCoreUI/Atomic/Atoms/Views/CheckboxLabelModel.swift b/MVMCoreUI/Atomic/Atoms/Views/CheckboxLabelModel.swift
index 0d09a97f..a24febf7 100644
--- a/MVMCoreUI/Atomic/Atoms/Views/CheckboxLabelModel.swift
+++ b/MVMCoreUI/Atomic/Atoms/Views/CheckboxLabelModel.swift
@@ -55,7 +55,7 @@ extension Array where Element == CheckboxLabelModel {
             }
             item.surface = surface
             item.selected = model.checkbox.selected
-            item.disabled = !(model.checkbox.enabled && !model.checkbox.readOnly)
+            item.enabled = model.checkbox.isEnabled
             return item
         })
     }
diff --git a/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/RadioButtonLabelModel.swift b/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/RadioButtonLabelModel.swift
index 294dd14b..cf48a794 100644
--- a/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/RadioButtonLabelModel.swift
+++ b/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/RadioButtonLabelModel.swift
@@ -59,7 +59,7 @@ extension Array where Element == RadioButtonLabelModel {
             }
             item.surface = surface
             item.selected = model.radioButton.state
-            item.disabled = !(model.radioButton.enabled && !model.radioButton.readOnly)
+            item.enabled = model.radioButton.isEnabled
             return item
         })
     }