diff --git a/packages/text-editor/src/kits/editor-kit.ts b/packages/text-editor/src/kits/editor-kit.ts
index 40a472c783..858b659579 100644
--- a/packages/text-editor/src/kits/editor-kit.ts
+++ b/packages/text-editor/src/kits/editor-kit.ts
@@ -68,7 +68,22 @@ export const EditorKit = Extension.create<EditorKitOptions>({
       }),
       CodemarkExtension,
       Underline,
-      ListKeymap,
+      ListKeymap.configure({
+        listTypes: [
+          {
+            itemName: 'listItem',
+            wrapperNames: ['bulletList', 'orderedList']
+          },
+          {
+            itemName: 'taskItem',
+            wrapperNames: ['taskList']
+          },
+          {
+            itemName: 'todoItem',
+            wrapperNames: ['todoList']
+          }
+        ]
+      }),
       NodeUuidExtension,
       ...tableExtensions
       // ...taskListExtensions // Disable since tasks are not working properly now.