From 6a8dd88fa7641df8b802dd029289baa054b3937b Mon Sep 17 00:00:00 2001
From: Vrund4591 <vrund4591@gmail.com>
Date: Fri, 2 Jan 2026 20:08:43 +0530
Subject: [PATCH 1/2] fix(fuselage): ensure MultiSelect dropdown closes on
 addon click

---
 .../src/components/MultiSelect/MultiSelect.tsx        | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/packages/fuselage/src/components/MultiSelect/MultiSelect.tsx b/packages/fuselage/src/components/MultiSelect/MultiSelect.tsx
index 739ed1bdcb..4e8c6cf729 100644
--- a/packages/fuselage/src/components/MultiSelect/MultiSelect.tsx
+++ b/packages/fuselage/src/components/MultiSelect/MultiSelect.tsx
@@ -144,20 +144,25 @@ const MultiSelect = forwardRef<HTMLInputElement, MultiSelectProps>(
       return show();
     });
 
+    const handleAddonClick = useEffectEvent((e: SyntheticEvent) => {
+      e.stopPropagation();
+      e.preventDefault();
+      handleClick();
+    });
+
     return (
       <Box
         is='div'
         rcx-select
         className={[error && 'invalid', disabled && 'disabled']}
         ref={containerRef}
-        onClick={handleClick}
         disabled={disabled}
         {...props}
       >
         <FlexItem grow={1}>
           <Margins inline='x4'>
             <FlexContainer>
-              <Box is='div'>
+              <Box is='div' onClick={handleClick}>
                 <Box
                   is='div'
                   display='flex'
@@ -216,6 +221,8 @@ const MultiSelect = forwardRef<HTMLInputElement, MultiSelectProps>(
         <FlexItem grow={0} shrink={0}>
           <Margins inline='x4'>
             <SelectAddon
+              onMouseDown={(e) => e.preventDefault()}
+              onClick={handleAddonClick}
               children={
                 <Icon
                   name={

From a82cf4e9b383441eefb0b1561a557b7d7299b6ef Mon Sep 17 00:00:00 2001
From: Vrund4591 <vrund4591@gmail.com>
Date: Fri, 2 Jan 2026 20:19:38 +0530
Subject: [PATCH 2/2] chore: add changeset

---
 .changeset/sour-zoos-help.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/sour-zoos-help.md

diff --git a/.changeset/sour-zoos-help.md b/.changeset/sour-zoos-help.md
new file mode 100644
index 0000000000..80fecaaedb
--- /dev/null
+++ b/.changeset/sour-zoos-help.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/fuselage': patch
+---
+
+fix: ensure MultiSelect dropdown closes on addon click