diff --git a/frontend/src/components/Comments.js b/frontend/src/components/Comments.js
index 09f7589a40b0f4479746c9b9bbcc503598248c7e..0d7b168630b2db6f99e8a5c0dfb30f6492ca43a3 100644
--- a/frontend/src/components/Comments.js
+++ b/frontend/src/components/Comments.js
@@ -138,7 +138,11 @@ export default function Messages({ place, infos, lastMessage, admin }) {
       let new_message = JSON.parse(lastMessage.data);
       if (new_message.type == "news" && infos) {
         setMessages((old_messages) => [new_message.comment, ...old_messages]);
-      } else if (!infos && new_message.type == "comment" && new_message.comment.username != user) {
+      } else if (
+        !infos &&
+        new_message.type == "comment" &&
+        new_message.comment.username != user.name
+      ) {
         setMessages((old_messages) => [...old_messages, new_message.comment]);
       }
     }
@@ -208,6 +212,12 @@ export default function Messages({ place, infos, lastMessage, admin }) {
             value={newComment}
             onChange={(ev) => updateValue(ev.target.value)}
             placeholder="Ajouter un commentaire"
+            onKeyDown={(ev) => {
+              if (ev.key === "Enter" && ev.shiftKey == false) {
+                ev.preventDefault();
+                Submit(ev);
+              }
+            }}
           />
           <button className="comment-input-button" onClick={Submit}>
             <BiSend />