diff --git a/internal_packages/composer-emoji/lib/emoji-button-popover.jsx b/internal_packages/composer-emoji/lib/emoji-button-popover.jsx
index fa55a9ef1..eea9b02fe 100644
--- a/internal_packages/composer-emoji/lib/emoji-button-popover.jsx
+++ b/internal_packages/composer-emoji/lib/emoji-button-popover.jsx
@@ -44,7 +44,7 @@ class EmojiButtonPopover extends React.Component {
   }
 
   onScroll = () => {
-    const emojiContainer = document.querySelector(".emoji-finder-container");
+    const emojiContainer = document.querySelector(".emoji-finder-container .scroll-region-content");
     const tabContainer = document.querySelector(".emoji-tabs");
     tabContainer.className = emojiContainer.scrollTop ? "emoji-tabs shadow" : "emoji-tabs";
     if (emojiContainer.scrollTop === 0) {
@@ -154,7 +154,7 @@ class EmojiButtonPopover extends React.Component {
   }
 
   scrollToCategory(category) {
-    const container = document.querySelector(".emoji-finder-container");
+    const container = document.querySelector(".emoji-finder-container .scroll-region-content");
     if (this.state.searchValue.length > 0) {
       this.setState({searchValue: ""});
       this.setState(this.getStateFromStore, () => {