diff --git a/MVMCoreUI/Atomic/Atoms/Buttons/PillButton.swift b/MVMCoreUI/Atomic/Atoms/Buttons/PillButton.swift
index 473e033d..4a7a8481 100644
--- a/MVMCoreUI/Atomic/Atoms/Buttons/PillButton.swift
+++ b/MVMCoreUI/Atomic/Atoms/Buttons/PillButton.swift
@@ -104,7 +104,7 @@ open class PillButton: Button, MVMCoreUIViewConstrainingProtocol {
             self.disabledTitleColor = disabledTitleColor
         }
         
-//        isAccessibilityElement = isEnabled
+        isAccessibilityElement = isEnabled
         
         if isEnabled {
             if let fillColor = buttonModel?.enabledColors.fill {
diff --git a/MVMCoreUI/Atomic/Atoms/Selectors/Checkbox.swift b/MVMCoreUI/Atomic/Atoms/Selectors/Checkbox.swift
index b440adaa..0de7f3b4 100644
--- a/MVMCoreUI/Atomic/Atoms/Selectors/Checkbox.swift
+++ b/MVMCoreUI/Atomic/Atoms/Selectors/Checkbox.swift
@@ -353,6 +353,7 @@ import MVMCore
     }
     
     override open func accessibilityActivate() -> Bool {
+        guard isEnabled else { return false }
         sendActions(for: .touchUpInside)
         return true
     }