diff --git a/components/BackgroundSelect.js b/components/BackgroundSelect.js
index d457b32..9520099 100644
--- a/components/BackgroundSelect.js
+++ b/components/BackgroundSelect.js
@@ -65,10 +65,10 @@ class BackgroundSelect extends React.PureComponent {
             ))}
           </div>
           <div className="picker-tabs-contents">
-            <div style={mode === 'color' ? {} : { display: 'none' }}>
+            <div hidden={mode !== 'color'}>
               <ColorPicker color={color} onChange={this.handlePickColor} />
             </div>
-            <div style={mode === 'image' ? {} : { display: 'none' }}>
+            <div hidden={mode !== 'image'}>
               <ImagePicker onChange={onChange} imageDataURL={image} aspectRatio={aspectRatio} />
             </div>
           </div>
diff --git a/components/ImagePicker.js b/components/ImagePicker.js
index c43e928..34cad37 100644
--- a/components/ImagePicker.js
+++ b/components/ImagePicker.js
@@ -214,6 +214,10 @@ export default class ImagePicker extends React.Component {
               opacity: 0.4;
             }
 
+            .choose-image > button:focus {
+              text-decoration: underline;
+            }
+
             form {
               display: flex;
               justify-content: space-between;
diff --git a/components/Input.js b/components/Input.js
index 256c4ec..764ee9a 100644
--- a/components/Input.js
+++ b/components/Input.js
@@ -27,7 +27,10 @@ const Input = React.forwardRef(({ color = COLORS.SECONDARY, align = 'right', ...
 
         input[type='file'] {
           cursor: pointer;
-          outline: none;
+        }
+
+        input[type='file']:focus {
+          outline: initial;
         }
       `}
     </style>
diff --git a/components/RandomImage.js b/components/RandomImage.js
index 0452dd9..1a625ed 100644
--- a/components/RandomImage.js
+++ b/components/RandomImage.js
@@ -73,6 +73,11 @@ function RandomImage(props) {
             cursor: ${loading ? 'not-allowed' : 'pointer'};
             user-select: none;
           }
+
+          [role='button']:focus {
+            outline: none;
+            text-decoration: underline;
+          }
         `}
       </style>
     </div>