diff --git a/src/components/base/CheckBox/index.js b/src/components/base/CheckBox/index.js
new file mode 100644
index 00000000..5865639d
--- /dev/null
+++ b/src/components/base/CheckBox/index.js
@@ -0,0 +1,67 @@
+// @flow
+
+import React from 'react'
+import noop from 'lodash/noop'
+import styled, { keyframes } from 'styled-components'
+
+import { Tabbable } from 'components/base/Box'
+import Icon from 'components/base/Icon'
+
+const bounce = keyframes`
+  0% {
+    transform: scale(1);
+  }
+  50% {
+    transform: scale(1.5);
+  }
+  100% {
+    transform: scale(1);
+  }
+`
+
+const Base = styled(Tabbable).attrs({
+  align: 'center',
+  justify: 'center',
+})`
+  cursor: pointer;
+  outline: none;
+  border-radius: 3px;
+  border: 1px solid transparent;
+  background-color: ${p => (p.isChecked ? p.theme.colors.blue : p.theme.colors.white)};
+  box-shadow: 0 0 0 ${p => (p.isChecked ? 4 : 1)}px
+    ${p => (p.isChecked ? p.theme.colors.cream : p.theme.colors.argile)};
+  font-size: 7px;
+  height: 19px;
+  width: 19px;
+  transition: all ease-in 0.1s;
+
+  &:focus {
+    border-color: ${p => p.theme.colors.mouse};
+  }
+`
+
+const IconWrapper = styled(Icon).attrs({
+  color: 'white',
+})`
+  animation: ${bounce} ease-in-out 350ms;
+`
+
+type Props = {
+  isChecked: boolean,
+  onChange?: Function,
+}
+
+function CheckBox(props: Props) {
+  const { isChecked, onChange, ...p } = props
+  return (
+    <Base isChecked={isChecked} onClick={() => onChange(!isChecked)} {...p}>
+      {isChecked && <IconWrapper name="check" />}
+    </Base>
+  )
+}
+
+CheckBox.defaultProps = {
+  onChange: noop,
+}
+
+export default CheckBox
diff --git a/src/components/base/CheckBox/stories.js b/src/components/base/CheckBox/stories.js
new file mode 100644
index 00000000..84e18e24
--- /dev/null
+++ b/src/components/base/CheckBox/stories.js
@@ -0,0 +1,11 @@
+// @flow
+
+import React from 'react'
+import { storiesOf } from '@storybook/react'
+import { boolean } from '@storybook/addon-knobs'
+
+import CheckBox from 'components/base/CheckBox'
+
+const stories = storiesOf('CheckBox', module)
+
+stories.add('basic', () => <CheckBox isChecked={boolean('isChecked', false)} />)
diff --git a/src/components/base/Checkbox/index.js b/src/components/base/Checkbox/index.js
deleted file mode 100644
index 33f7c1ef..00000000
--- a/src/components/base/Checkbox/index.js
+++ /dev/null
@@ -1,106 +0,0 @@
-// @flow
-
-import React, { PureComponent } from 'react'
-import styled, { keyframes } from 'styled-components'
-
-import Box from 'components/base/Box'
-import Icon from 'components/base/Icon'
-
-const bounce = keyframes`
-  0% {
-    transform: scale(1, 1);
-  }
-
-  50% {
-    transform: scale(1.7, 1.7);
-  }
-
-  100% {
-    transform: scale(1, 1);
-  }
-`
-
-const Base = styled(Box).attrs({
-  align: 'center',
-  justify: 'center',
-  relative: true,
-})`
-  background-color: ${p => (p.checked ? p.theme.colors.blue : p.theme.colors.white)};
-  box-shadow: 0 0 0 ${p => (p.checked ? 4 : 1)}px
-    ${p => (p.checked ? p.theme.colors.cream : p.theme.colors.argile)};
-  font-size: 7px;
-  height: 19px;
-  width: 19px;
-  transition: all ease-in-out 0.1s;
-
-  input[type='checkbox'] {
-    bottom: 0;
-    cursor: pointer;
-    height: 100%;
-    left: 0;
-    opacity: 0;
-    position: absolute;
-    right: 0;
-    top: 0;
-    width: 100%;
-    z-index: 10;
-  }
-`
-
-const IconWrapper = styled(Icon).attrs({
-  color: 'white',
-})`
-  animation: ${bounce} ease-in-out 0.5s;
-`
-
-type Props = {
-  checked: boolean,
-  onChange?: Function,
-}
-
-type State = {
-  checked: boolean,
-}
-
-class Checkbox extends PureComponent<Props, State> {
-  static defaultProps = {
-    checked: false,
-  }
-
-  state = {
-    checked: this.props.checked,
-  }
-
-  componentWillReceiveProps(nextProps: Props) {
-    this.setState({
-      checked: nextProps.checked,
-    })
-  }
-
-  handleChange = (e: SyntheticInputEvent<HTMLInputElement>) => {
-    const { onChange } = this.props
-    const { checked } = e.target
-
-    this.setState({
-      checked,
-    })
-
-    if (onChange) {
-      onChange(checked)
-    }
-  }
-
-  render() {
-    const { checked } = this.state
-    const { onChange, ...props } = this.props
-
-    return (
-      <Base {...props} checked={checked}>
-        <input type="checkbox" checked={checked} onChange={this.handleChange} />
-        {checked && <IconWrapper name="check" />}
-      </Base>
-    )
-  }
-}
-
-export default Checkbox
diff --git a/src/components/base/Checkbox/stories.js b/src/components/base/Checkbox/stories.js
deleted file mode 100644
index 0841d3e9..00000000
--- a/src/components/base/Checkbox/stories.js
+++ /dev/null
@@ -1,11 +0,0 @@
-// @flow
-
-import React from 'react'
-import { storiesOf } from '@storybook/react'
-import { boolean } from '@storybook/addon-knobs'
-
-import Checkbox from 'components/base/Checkbox'
-
-const stories = storiesOf('Checkbox', module)
-
-stories.add('basic', () => <Checkbox checked={boolean('checked', false)} />)
diff --git a/src/components/modals/AddAccount/ImportAccounts.js b/src/components/modals/AddAccount/ImportAccounts.js
index f6bbc805..6394af0a 100644
--- a/src/components/modals/AddAccount/ImportAccounts.js
+++ b/src/components/modals/AddAccount/ImportAccounts.js
@@ -9,7 +9,7 @@ import { formatBTC } from 'helpers/format'
 
 import Box from 'components/base/Box'
 import Button from 'components/base/Button'
-import Checkbox from 'components/base/Checkbox'
+import CheckBox from 'components/base/CheckBox'
 import Input from 'components/base/Input'
 
 type Props = {
@@ -86,8 +86,8 @@ class ImportAccounts extends PureComponent<Props, State> {
               return (
                 <Box key={account.id} horizontal flow={10}>
                   <Box>
-                    <Checkbox
-                      checked={selected}
+                    <CheckBox
+                      isChecked={selected}
                       onChange={this.handleSelectAccount(account.id, selected)}
                     />
                   </Box>