diff --git a/src/components/Checkbox.js b/src/components/Checkbox.js
index 9e4f5da57dcf..2e12179784cc 100644
--- a/src/components/Checkbox.js
+++ b/src/components/Checkbox.js
@@ -50,24 +50,11 @@ const defaultProps = {
 class Checkbox extends React.Component {
     constructor(props) {
         super(props);
-        this.state = {
-            isFocused: false,
-        };
 
-        this.onFocus = this.onFocus.bind(this);
-        this.onBlur = this.onBlur.bind(this);
         this.handleSpaceKey = this.handleSpaceKey.bind(this);
         this.firePressHandlerOnClick = this.firePressHandlerOnClick.bind(this);
     }
 
-    onFocus() {
-        this.setState({isFocused: true});
-    }
-
-    onBlur() {
-        this.setState({isFocused: false});
-    }
-
     handleSpaceKey(event) {
         if (event.code !== 'Space') {
             return;
@@ -83,13 +70,6 @@ class Checkbox extends React.Component {
             return;
         }
 
-        const wasChecked = this.props.isChecked;
-
-        // If checkbox is checked and focused, make sure it's unfocused when pressed.
-        if (this.state.isFocused && wasChecked) {
-            this.onBlur();
-        }
-
         this.props.onPress();
     }
 
@@ -99,10 +79,7 @@ class Checkbox extends React.Component {
                 disabled={this.props.disabled}
                 onPress={this.firePressHandlerOnClick}
                 onMouseDown={this.props.onMouseDown}
-                onFocus={this.onFocus}
-                onBlur={this.onBlur}
                 ref={this.props.forwardedRef}
-                onPressOut={this.onBlur}
                 style={this.props.style}
                 onKeyDown={this.handleSpaceKey}
                 accessibilityRole="checkbox"
@@ -120,8 +97,10 @@ class Checkbox extends React.Component {
                             this.props.isChecked && styles.checkedContainer,
                             this.props.hasError && styles.borderColorDanger,
                             this.props.disabled && styles.cursorDisabled,
-                            (this.state.isFocused || this.props.isChecked) && styles.borderColorFocus,
+                            this.props.isChecked && styles.borderColorFocus,
                         ]}
+                        // Used as CSS selector to customize focus-visible style
+                        dataSet={{checkbox: true}}
                     >
                         {this.props.isChecked && (
                             <Icon
diff --git a/web/index.html b/web/index.html
index 90011c87e7a9..3dfeed27a4d2 100644
--- a/web/index.html
+++ b/web/index.html
@@ -64,6 +64,9 @@
         select:focus-visible, select:focus[data-focusvisible-polyfill]  {
             box-shadow: none;
         }
+        div[role="checkbox"]:focus-visible > div[data-checkbox], div[role="checkbox"]:focus[data-focusvisible-polyfill] > div[data-checkbox] {
+            border-color: #03D47C !important;
+        }
         ::-ms-reveal {
             display: none;
         }