diff --git a/frontend/src/components/chat/MessageComposer/Input.tsx b/frontend/src/components/chat/MessageComposer/Input.tsx
index 6571243d64..f821240724 100644
--- a/frontend/src/components/chat/MessageComposer/Input.tsx
+++ b/frontend/src/components/chat/MessageComposer/Input.tsx
@@ -154,13 +154,13 @@ const Input = forwardRef<InputMethods, Props>(
         }
       }
 
-      // Handle regular enter only if command menu is not showing
+      // Handle regular enter only if command dropdown is actually visible
       if (
         e.key === 'Enter' &&
         !e.shiftKey &&
         onEnter &&
         !isComposing &&
-        !showCommands
+        !(showCommands && filteredCommands.length > 0)
       ) {
         e.preventDefault();
         onEnter();