diff --git a/src/app/molecules/message/Message.jsx b/src/app/molecules/message/Message.jsx
index c1da0f06..440197b3 100644
--- a/src/app/molecules/message/Message.jsx
+++ b/src/app/molecules/message/Message.jsx
@@ -128,10 +128,19 @@ MessageContent.propTypes = {
 
 function MessageEdit({ content, onSave, onCancel }) {
   const editInputRef = useRef(null);
+
+  function handleKeyDown(e) {
+    if (e.keyCode === 13 && e.shiftKey === false) {
+      e.preventDefault();
+      onSave(editInputRef.current.value);
+    }
+  }
+
   return (
     <form className="message__edit" onSubmit={(e) => { e.preventDefault(); onSave(editInputRef.current.value); }}>
       <Input
         forwardRef={editInputRef}
+        onKeyDown={handleKeyDown}
         value={content}
         placeholder="Edit message"
         required
diff --git a/src/app/organisms/profile-editor/ProfileEditor.jsx b/src/app/organisms/profile-editor/ProfileEditor.jsx
index a124acaa..7125f441 100644
--- a/src/app/organisms/profile-editor/ProfileEditor.jsx
+++ b/src/app/organisms/profile-editor/ProfileEditor.jsx
@@ -7,7 +7,6 @@ import colorMXID from '../../../util/colorMXID';
 import Button from '../../atoms/button/Button';
 import ImageUpload from '../../molecules/image-upload/ImageUpload';
 import Input from '../../atoms/input/Input';
-import Text from '../../atoms/text/Text';
 
 import './ProfileEditor.scss';