diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 5d9496e78d..e3063babb1 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -513,9 +513,16 @@ export default class MessageComposerInput extends React.Component {
     };
 
     handleReturn = (ev) => {
-        if (ev.shiftKey) {
-            this.onEditorContentChanged(RichUtils.insertSoftNewline(this.state.editorState));
-            return true;
+        const currentBlockType = RichUtils.getCurrentBlockType(this.state.editorState);
+        // If we're in any of these three types of blocks, shift enter should insert soft newlines
+        // And just enter should end the block
+        if(['blockquote', 'unordered-list-item', 'ordered-list-item'].includes(currentBlockType)) {
+            if(ev.shiftKey) {
+                this.onEditorContentChanged(RichUtils.insertSoftNewline(this.state.editorState));
+                return true;
+            }
+
+            return false;
         }
 
         const contentState = this.state.editorState.getCurrentContent();