From 37e57e0aaa91c5f00b6f4e376c3b9de03a12f75d Mon Sep 17 00:00:00 2001
From: Steve Howell <showell@zulip.com>
Date: Thu, 18 Jun 2020 16:41:58 +0000
Subject: [PATCH] emoji picker: Only modify parent popover for tab clicks.

---
 static/js/emoji_picker.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/static/js/emoji_picker.js b/static/js/emoji_picker.js
index 51e8a9dd30..14fd19a2e7 100644
--- a/static/js/emoji_picker.js
+++ b/static/js/emoji_picker.js
@@ -704,12 +704,16 @@ exports.register_click_handlers = function () {
     $("body").on("click", ".emoji-popover-tab-item", function (e) {
         e.stopPropagation();
         e.preventDefault();
+
+        const $popover = $(e.currentTarget).closest('.emoji-info-popover').expectOne();
+        const $emoji_map = $popover.find(".emoji-popover-emoji-map");
+
         const offset = section_head_offsets.find(function (o) {
             return o.section === $(this).attr("data-tab-name");
         }.bind(this));
 
         if (offset) {
-            ui.get_scroll_element($(".emoji-popover-emoji-map")).scrollTop(offset.position_y);
+            ui.get_scroll_element($emoji_map).scrollTop(offset.position_y);
         }
     });