diff --git a/packages/emoji-mart/src/components/Picker/Picker.tsx b/packages/emoji-mart/src/components/Picker/Picker.tsx
index 24cad2e6..70bb1d94 100644
--- a/packages/emoji-mart/src/components/Picker/Picker.tsx
+++ b/packages/emoji-mart/src/components/Picker/Picker.tsx
@@ -656,6 +656,8 @@ export default class Picker extends Component {
     if (!this.state.showSkins) return
     this.setState({ showSkins: null, tempSkin: null })
 
+    this.refs.skinToneButton.current.focus()
+
     this.base.removeEventListener('click', this.handleBaseClick)
     this.base.removeEventListener('keydown', this.handleBaseKeydown)
   }