diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9ee71e89c..6219c497d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -68,6 +68,7 @@
 
 ### v3.3.6 / 2020-07-xx
 
+* [558](https://github.com/Vanessa219/vditor/issues/558) [suggestion] shift+enter and end the lists `改进功能`
 * [547](https://github.com/Vanessa219/vditor/issues/547) 文件上传 format 第一个参数 files 为空数组 `修复缺陷`
 * [562](https://github.com/Vanessa219/vditor/issues/562) 为上传添加 fieldName 选项 `引入特性`
 * [553](https://github.com/Vanessa219/vditor/issues/553) 子任务列表回车问题 `改进功能`
diff --git a/src/ts/sv/processKeydown.ts b/src/ts/sv/processKeydown.ts
index 9618084a8..53e547867 100644
--- a/src/ts/sv/processKeydown.ts
+++ b/src/ts/sv/processKeydown.ts
@@ -67,7 +67,8 @@ export const processKeydown = (vditor: IVditor, event: KeyboardEvent) => {
         const space = listElement.getAttribute("data-space");
         const taskMarkerElements = listElement.querySelectorAll('[data-type="task-marker"]');
         // 回车
-        if (event.key === "Enter" && !isCtrl(event) && !event.altKey) {
+        if (event.key === "Enter" && !isCtrl(event) && !event.altKey && !event.shiftKey) {
+            // enter
             if (markerElement && startIndex ===
                 markerElement.textContent.length + space.length + (taskMarkerElements.length > 0 ? 4 : 0)) {
                 let addUndoStack = true;