From c35811ddf5d34d5ac1e2c0b0b76131049ae75cbb Mon Sep 17 00:00:00 2001
From: Ritvik jain <34532173+ritvikjain99@users.noreply.github.com>
Date: Thu, 21 May 2020 09:52:37 +0530
Subject: [PATCH] [FIX] Can't click on room's actions menu of sidebar list when
 in search mode (#16548)

---
 app/ui-message/client/popup/messagePopup.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/ui-message/client/popup/messagePopup.js b/app/ui-message/client/popup/messagePopup.js
index 7ac6a7d785f..f948dd6d4ff 100644
--- a/app/ui-message/client/popup/messagePopup.js
+++ b/app/ui-message/client/popup/messagePopup.js
@@ -288,12 +288,16 @@ Template.messagePopup.events({
 		const template = Template.instance();
 		template.clickingItem = true;
 	},
-	'mouseup .popup-item, touchend .popup-item'() {
+	'mouseup .popup-item, touchend .popup-item'(e) {
+		e.stopPropagation();
 		const template = Template.instance();
+		const wasMenuIconClicked = e.target.classList.contains('sidebar-item__menu-icon');
 		template.clickingItem = false;
-		template.value.set(this._id);
-		template.enterValue();
-		template.open.set(false);
+		if (!wasMenuIconClicked) {
+			template.value.set(this._id);
+			template.enterValue();
+			template.open.set(false);
+		}
 	},
 });