diff --git a/src/components/middle/composer/BotCommandTooltip.tsx b/src/components/middle/composer/BotCommandTooltip.tsx
index 5711f6e0e..8d00320f7 100644
--- a/src/components/middle/composer/BotCommandTooltip.tsx
+++ b/src/components/middle/composer/BotCommandTooltip.tsx
@@ -55,7 +55,7 @@ const BotCommandTooltip: FC<OwnProps & StateProps> = ({
 
   const handleSelect = useCallback((botCommand: ApiBotCommand) => {
     // We need an additional check because tooltip is updated with throttling
-    if (!botCommand.command.startsWith(getHtml())) {
+    if (!botCommand.command.startsWith(getHtml().slice(1))) {
       return false;
     }
 
diff --git a/src/components/middle/composer/hooks/useBotCommandTooltip.ts b/src/components/middle/composer/hooks/useBotCommandTooltip.ts
index a4d7f0131..70b2c99fb 100644
--- a/src/components/middle/composer/hooks/useBotCommandTooltip.ts
+++ b/src/components/middle/composer/hooks/useBotCommandTooltip.ts
@@ -39,7 +39,7 @@ export default function useBotCommandTooltip(
     }
 
     const filter = command.substring(1);
-    const nextFilteredBotCommands = commands.filter((c) => !filter || c.command.includes(filter));
+    const nextFilteredBotCommands = commands.filter((c) => !filter || c.command.startsWith(filter));
 
     setFilteredBotCommands(
       nextFilteredBotCommands?.length ? nextFilteredBotCommands : undefined,