diff --git a/src/rich_text_editor/model/RichTextEditor.js b/src/rich_text_editor/model/RichTextEditor.js
index 918b3a420..544662283 100644
--- a/src/rich_text_editor/model/RichTextEditor.js
+++ b/src/rich_text_editor/model/RichTextEditor.js
@@ -238,8 +238,11 @@ export default class RichTextEditor {
   }
 
   __onKeydown(event) {
-    if (event.key === 'Enter') {
-      this.doc.execCommand('insertLineBreak');
+    const { doc } = this;
+    const cmdList = ['insertOrderedList', 'insertUnorderedList'];
+
+    if (event.key === 'Enter' && !cmdList.some(cmd => doc.queryCommandState(cmd))) {
+      doc.execCommand('insertLineBreak');
       event.preventDefault();
     }
   }