diff --git a/src/js/components/CheckBox/CheckBox.js b/src/js/components/CheckBox/CheckBox.js
index <HASH>..<HASH> 100644
--- a/src/js/components/CheckBox/CheckBox.js
+++ b/src/js/components/CheckBox/CheckBox.js
@@ -67,7 +67,13 @@ const CheckBox = forwardRef(
     });
 
     const [focus, setFocus] = useState(focusProp);
-    useEffect(() => setFocus(focusProp), [focusProp]);
+    useEffect(() => {
+      // don't allow checkbox to have focus when disabled
+      if (disabled && focusProp) 
+        setFocus(false);
+      else 
+        setFocus(focusProp);
+    }, [disabled, focusProp]);
 
     useEffect(() => {
       if (checkedProp && indeterminate) {
Fixes Checkbox focus state when checkbox is disabled (#<I>)

* fixed #<I>



Updated CheckBox component to turn off the focus when checkbox is disabled



* Update CheckBox.js