diff --git a/static/css/style.css b/static/css/style.css
index cb20484..eb6f003 100644
--- a/static/css/style.css
+++ b/static/css/style.css
@@ -425,6 +425,25 @@ p {
 /* Message input area */
 #message-form {
     margin-top: var(--space-3);
+    display: flex;
+    gap: var(--space-2);
+    align-items: flex-end;
+}
+
+#send-button {
+    padding: var(--space-2) var(--space-4);
+    background-color: var(--button-primary);
+    color: white;
+    border: none;
+    border-radius: var(--radius-md);
+    cursor: pointer;
+    font-size: 14px;
+    min-height: 60px;
+    white-space: nowrap;
+}
+
+#send-button:hover {
+    opacity: 0.9;
 }
 
 #message, .message-edit {
diff --git a/templates/chat.html b/templates/chat.html
index cd76d7c..c1fa348 100644
--- a/templates/chat.html
+++ b/templates/chat.html
@@ -17,7 +17,8 @@
 
         <!-- Form for sending messages -->
         <form id="message-form">
-            <textarea id="message" placeholder="Type your message..."></textarea>
+            <textarea id="message" placeholder="Type your message..." onkeydown="if(event.key==='Enter'&&!event.shiftKey){event.preventDefault();sendMessage();}"></textarea>
+            <button type="submit" id="send-button">Send</button>
         </form>
     </div>