diff --git a/src/components/EmojiPicker/EmojiPickerMenu/index.js b/src/components/EmojiPicker/EmojiPickerMenu/index.js index dfa06e8daab2..6e2856a7e058 100755 --- a/src/components/EmojiPicker/EmojiPickerMenu/index.js +++ b/src/components/EmojiPicker/EmojiPickerMenu/index.js @@ -524,6 +524,9 @@ class EmojiPickerMenu extends Component { render() { const isFiltered = this.emojis.length !== this.state.filteredEmojis.length; + const listStyle = StyleUtils.getEmojiPickerListHeight(isFiltered, this.props.windowHeight); + const height = !listStyle.maxHeight || listStyle.height < listStyle.maxHeight ? listStyle.height : listStyle.maxHeight; + const overflowLimit = Math.floor(height / CONST.EMOJI_PICKER_ITEM_HEIGHT) * 8; return (