diff --git a/src/components/common/Composer.tsx b/src/components/common/Composer.tsx
index 5d9819b15..6bca516aa 100644
--- a/src/components/common/Composer.tsx
+++ b/src/components/common/Composer.tsx
@@ -2461,6 +2461,7 @@ const Composer = ({
className={buildClassName('composer-action-button', isBotKeyboardOpen && 'activated')}
round
color="translucent"
+ noClickActivation
onActivate={openBotKeyboard}
ariaLabel={lang('AriaComposerBotKeyboard')}
>
diff --git a/src/components/middle/composer/BotKeyboardMenu.tsx b/src/components/middle/composer/BotKeyboardMenu.tsx
index 9f7486d02..eaa5507a2 100644
--- a/src/components/middle/composer/BotKeyboardMenu.tsx
+++ b/src/components/middle/composer/BotKeyboardMenu.tsx
@@ -66,6 +66,7 @@ const BotKeyboardMenu = ({
onCloseAnimationEnd={onClose}
onMouseEnter={!IS_TOUCH_ENV ? handleMouseEnter : undefined}
onMouseLeave={!IS_TOUCH_ENV ? handleMouseLeave : undefined}
+ noCloseOnBackdrop={!IS_TOUCH_ENV}
noCompact
>
diff --git a/src/components/ui/ResponsiveHoverButton.tsx b/src/components/ui/ResponsiveHoverButton.tsx
index 8ccaa8bd5..59574c316 100644
--- a/src/components/ui/ResponsiveHoverButton.tsx
+++ b/src/components/ui/ResponsiveHoverButton.tsx
@@ -12,6 +12,7 @@ import Button from './Button';
type OwnProps = {
onActivate: (e: React.MouseEvent) => void;
+ noClickActivation?: boolean;
} & Omit = ({ onActivate, ...buttonProps }) => {
+const ResponsiveHoverButton: FC = ({ onActivate, noClickActivation, ...buttonProps }) => {
const isMouseInsideRef = useRef(false);
const handleMouseEnter = useLastCallback((e: React.MouseEvent) => {
@@ -60,7 +61,7 @@ const ResponsiveHoverButton: FC = ({ onActivate, ...buttonProps }) =>
{...buttonProps}
onMouseEnter={!IS_TOUCH_ENV ? handleMouseEnter : undefined}
onMouseLeave={!IS_TOUCH_ENV ? handleMouseLeave : undefined}
- onClick={!IS_TOUCH_ENV ? onActivate : handleClick}
+ onClick={!IS_TOUCH_ENV ? (noClickActivation ? undefined : onActivate) : handleClick}
/>
);
};