diff --git a/apps/meteor/client/views/room/MessageList/components/Toolbox/MessageActionMenu.tsx b/apps/meteor/client/views/room/MessageList/components/Toolbox/MessageActionMenu.tsx
index fd103cda3f599..439d257569b8f 100644
--- a/apps/meteor/client/views/room/MessageList/components/Toolbox/MessageActionMenu.tsx
+++ b/apps/meteor/client/views/room/MessageList/components/Toolbox/MessageActionMenu.tsx
@@ -38,7 +38,10 @@ export const MessageActionMenu: FC<{
 		<MessageToolboxItem
 			ref={ref}
 			icon='kebab'
-			onClick={(): void => setVisible(!visible)}
+			onClick={(e): void => {
+				e.stopPropagation();
+				setVisible(!visible);
+			}}
 			data-qa-id='menu'
 			data-qa-type='message-action-menu'
 			title={t('More')}
diff --git a/apps/meteor/client/views/room/MessageList/components/Toolbox/Toolbox.tsx b/apps/meteor/client/views/room/MessageList/components/Toolbox/Toolbox.tsx
index 06591e9d877df..d651203379237 100644
--- a/apps/meteor/client/views/room/MessageList/components/Toolbox/Toolbox.tsx
+++ b/apps/meteor/client/views/room/MessageList/components/Toolbox/Toolbox.tsx
@@ -54,10 +54,7 @@ export const Toolbox: FC<{ message: IMessage }> = ({ message }) => {
 		<MessageToolbox>
 			{messageActions.map((action) => (
 				<MessageToolboxItem
-					onClick={(e): void => {
-						e.stopPropagation();
-						action.action(e, { message, tabbar: toolbox, room, chat });
-					}}
+					onClick={(e): void => action.action(e, { message, tabbar: toolbox, room, chat })}
 					key={action.id}
 					icon={action.icon}
 					title={t(action.label)}
@@ -69,10 +66,7 @@ export const Toolbox: FC<{ message: IMessage }> = ({ message }) => {
 				<MessageActionMenu
 					options={menuActions.map((action) => ({
 						...action,
-						action: (e): void => {
-							e.stopPropagation();
-							action.action(e, { message, tabbar: toolbox, room, chat });
-						},
+						action: (e): void => action.action(e, { message, tabbar: toolbox, room, chat }),
 					}))}
 					data-qa-type='message-action-menu-options'
 				/>