diff --git a/src/components/EmojiPicker/EmojiSkinToneList.js b/src/components/EmojiPicker/EmojiSkinToneList.js
index cc573ed94945..b06e6bdc005d 100644
--- a/src/components/EmojiPicker/EmojiSkinToneList.js
+++ b/src/components/EmojiPicker/EmojiSkinToneList.js
@@ -86,7 +86,7 @@ class EmojiSkinToneList extends Component {
                                     <EmojiPickerMenuItem
                                         onPress={() => this.updateSelectedSkinTone(skinToneEmoji)}
                                         onHoverIn={() => this.setState({highlightedIndex: skinToneEmoji.skinTone})}
-                                        onHoverOut={() => this.setState({highlightedIndex: -1})}
+                                        onHoverOut={() => this.setState({highlightedIndex: selectedEmoji.skinTone})}
                                         key={skinToneEmoji.code}
                                         emoji={skinToneEmoji.code}
                                         isHighlighted={skinToneEmoji.skinTone === this.state.highlightedIndex || skinToneEmoji.skinTone === selectedEmoji.skinTone}