From e1a582395f6590bdba0a029edf9f9398ca5da43b Mon Sep 17 00:00:00 2001
From: "Query&mut NinjaStyle, &Ryder" <97464694+X1Vi@users.noreply.github.com>
Date: Mon, 13 Jan 2025 14:48:41 +0530
Subject: [PATCH] fixed issue where it automatically scroll to top when custom
 emoji are loaded (#29608)

---
 webapp/channels/src/components/emoji_picker/emoji_picker.tsx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/webapp/channels/src/components/emoji_picker/emoji_picker.tsx b/webapp/channels/src/components/emoji_picker/emoji_picker.tsx
index f846fac512..235183c512 100644
--- a/webapp/channels/src/components/emoji_picker/emoji_picker.tsx
+++ b/webapp/channels/src/components/emoji_picker/emoji_picker.tsx
@@ -122,7 +122,10 @@ const EmojiPicker = ({
 
         const [updatedCategoryOrEmojisRows, updatedEmojiPositions] = createCategoryAndEmojiRows(allEmojis, categories, filter, userSkinTone);
 
-        selectFirstEmoji(updatedEmojiPositions);
+        if (activeCategory !== 'custom') {
+            selectFirstEmoji(updatedEmojiPositions);
+        }
+
         setCategoryOrEmojisRows(updatedCategoryOrEmojisRows);
         setEmojiPositionsArray(updatedEmojiPositions);
         throttledSearchCustomEmoji.current(filter, customEmojisEnabled);