diff --git a/app/InputFrontend.tsx b/app/InputFrontend.tsx
index c3cdea8..cf9dffc 100644
--- a/app/InputFrontend.tsx
+++ b/app/InputFrontend.tsx
@@ -14,19 +14,28 @@ const InputFrontend = React.forwardRef<HTMLDivElement, InputProps>(
       setInputValue(e.target.value);
     };
 
+    const handleKeyDown = (event: React.KeyboardEvent<HTMLInputElement>) => {
+      if (event.key === 'Enter') {
+        onSendClick(inputValue); // Call the function passed via props
+        setInputValue(''); // Optionally clear input after submission
+        event.preventDefault(); // Prevent default action (e.g., form submission)
+      }
+    };
+
     return (
-      <div className="input" id="inputForm">
+      <div className="input" id="inputForm" ref={ref}>
         <input
           type="text"
           name="user_message"
           placeholder="Type your message here..."
           value={inputValue}
           onChange={handleInputChange}
+          onKeyDown={handleKeyDown}
         />
-        <button type="submit" onClick={() => onSendClick(inputValue)}>
+        <button type="button" onClick={() => onSendClick(inputValue)}>
           <img src="/img/send.svg" alt="send" />
         </button>
-        <button type="submit" onClick={onMicClick}>
+        <button type="button" onClick={onMicClick}>
           <img src="/img/microphone.svg" alt="microphone" />
         </button>
       </div>