diff --git a/src/components/common/Composer.tsx b/src/components/common/Composer.tsx
index 74d40c0eb..ece0022f0 100644
--- a/src/components/common/Composer.tsx
+++ b/src/components/common/Composer.tsx
@@ -2457,16 +2457,26 @@ const Composer = ({
                       />
                     )}
                     {Boolean(botKeyboardMessageId) && !activeVoiceRecording && !editingMessage && (
-                      <ResponsiveHoverButton
-                        className={buildClassName('composer-action-button', isBotKeyboardOpen && 'activated')}
-                        round
-                        color="translucent"
-                        noClickActivation
-                        onActivate={openBotKeyboard}
-                        ariaLabel={lang('AriaComposerBotKeyboard')}
-                      >
-                        <Icon name="bot-command" />
-                      </ResponsiveHoverButton>
+                      <>
+                        <ResponsiveHoverButton
+                          className={buildClassName('composer-action-button', isBotKeyboardOpen && 'activated')}
+                          round
+                          color="translucent"
+                          noClickActivation
+                          onActivate={openBotKeyboard}
+                          ariaLabel={lang('AriaComposerBotKeyboard')}
+                        >
+                          <Icon name="bot-command" />
+                        </ResponsiveHoverButton>
+                        {!isMobile && (
+                          <BotKeyboardMenu
+                            messageId={botKeyboardMessageId}
+                            threadId={threadId}
+                            isOpen={isBotKeyboardOpen}
+                            onClose={closeBotKeyboard}
+                          />
+                        )}
+                      </>
                     )}
                   </>
                 )}
@@ -2508,7 +2518,7 @@ const Composer = ({
               paidMessagesStars={paidMessagesStars}
             />
           )}
-          {isInMessageList && Boolean(botKeyboardMessageId) && (
+          {isMobile && isInMessageList && Boolean(botKeyboardMessageId) && (
             <BotKeyboardMenu
               messageId={botKeyboardMessageId}
               threadId={threadId}
diff --git a/src/components/middle/composer/BotKeyboardMenu.module.scss b/src/components/middle/composer/BotKeyboardMenu.module.scss
index 83099161a..e93dc5cf3 100644
--- a/src/components/middle/composer/BotKeyboardMenu.module.scss
+++ b/src/components/middle/composer/BotKeyboardMenu.module.scss
@@ -2,9 +2,32 @@
 
 .root {
   :global(.bubble) {
-    width: 100% !important;
+    width: calc(100vw - 4rem) !important;
     max-width: 27rem;
     border-radius: var(--border-radius-default-small);
+
+    @media (max-width: 600px) {
+      width: calc(100vw - 3rem) !important;
+    }
+  }
+
+  :global(body.is-touch-env) & {
+    :global(.bubble) {
+      width: 100% !important;
+    }
+  }
+
+  :global(.is-pointer-env) & {
+    > :global(.backdrop) {
+      position: absolute;
+      top: -0.5rem;
+      right: 0;
+      bottom: auto;
+      left: auto;
+
+      width: 3.5rem;
+      height: 4.5rem;
+    }
   }
 }
 
diff --git a/src/components/middle/composer/BotKeyboardMenu.tsx b/src/components/middle/composer/BotKeyboardMenu.tsx
index eaa5507a2..5a122ddb7 100644
--- a/src/components/middle/composer/BotKeyboardMenu.tsx
+++ b/src/components/middle/composer/BotKeyboardMenu.tsx
@@ -1,5 +1,5 @@
 import type { TeactNode } from '../../../lib/teact/teact';
-import { memo, useMemo } from '../../../lib/teact/teact';
+import { memo, useEffect, useMemo } from '../../../lib/teact/teact';
 import { getActions, withGlobal } from '../../../global';
 
 import type { ApiMessage } from '../../../api/types';
@@ -39,9 +39,15 @@ const BotKeyboardMenu = ({
 
   const lang = useLang();
 
-  const [handleMouseEnter, handleMouseLeave] = useMouseInside(isOpen, onClose);
+  const [handleMouseEnter, handleMouseLeave, markMouseInside] = useMouseInside(isOpen, onClose);
   const { isKeyboardSingleUse } = message || {};
 
+  useEffect(() => {
+    if (isOpen) {
+      markMouseInside();
+    }
+  }, [isOpen, markMouseInside]);
+
   const buttonTexts = useMemo(() => {
     const texts: TeactNode[][] = [];
     message?.keyboardButtons!.forEach((row) => {