diff --git a/packages/plugin-emoji/src/node.ts b/packages/plugin-emoji/src/node.ts
index 74e76b5ed8c..6407b2820ed 100644
--- a/packages/plugin-emoji/src/node.ts
+++ b/packages/plugin-emoji/src/node.ts
@@ -31,7 +31,7 @@ export const emojiNode = createNode<string, EmojiOptions>((utils, options) => {
         schema: () => ({
             group: 'inline',
             inline: true,
-            selectable: false,
+            atom: true,
             attrs: {
                 html: {
                     default: '',
diff --git a/packages/preset-commonmark/src/plugin/inline-nodes-cursor.ts b/packages/preset-commonmark/src/plugin/inline-nodes-cursor.ts
index 3a10e28f5bb..f88a6ad9f8a 100644
--- a/packages/preset-commonmark/src/plugin/inline-nodes-cursor.ts
+++ b/packages/preset-commonmark/src/plugin/inline-nodes-cursor.ts
@@ -52,10 +52,13 @@ export const inlineNodesCursorPlugin: Plugin = new Plugin({
                 const leftDec = Decoration.widget(position, left, {
                     side: -1,
                 });
+                const right = document.createElement('span');
+                const rightDec = Decoration.widget(position, right);
                 setTimeout(() => {
                     left.contentEditable = 'true';
+                    right.contentEditable = 'true';
                 });
-                return DecorationSet.create(state.doc, [leftDec]);
+                return DecorationSet.create(state.doc, [leftDec, rightDec]);
             }
             return DecorationSet.empty;
         },