diff --git a/packages/extension-task-item/index.ts b/packages/extension-task-item/index.ts
index ac64dceb..7ebc8006 100644
--- a/packages/extension-task-item/index.ts
+++ b/packages/extension-task-item/index.ts
@@ -78,6 +78,7 @@ const TaskItem = createNode({
           view.dispatch(view.state.tr.setNodeMarkup(getPos(), undefined, {
             checked,
           }))
+          editor.focus()
         }
       })
 
@@ -94,6 +95,13 @@ const TaskItem = createNode({
       return {
         dom: listItem,
         contentDOM: content,
+        update: node => {
+          if (node.type !== this.type) {
+            return false
+          }
+
+          return true
+        },
       }
     }
   },