@@ -2,10 +2,52 @@ import { afterEach, expect, it } from "vite-plus/test";
 
 import { BlockNoteEditor } from "../../editor/BlockNoteEditor.js";
 import { SideMenuExtension } from "./SideMenu.js";
+import { MultipleNodeSelection } from "./MultipleNodeSelection.js";
+import { getNodeById } from "../../api/nodeUtil.js";
 import { unsetDragImage } from "./dragging.js";
 
 const cleanup: (() => void)[] = [];
 
+it("drags only the child when its parent has a single-block selection", () => {
+  const container = document.createElement("div");
+  document.body.appendChild(container);
+  cleanup.push(() => container.remove());
+  const editor = BlockNoteEditor.create({
+    initialContent: [
+      {
+        id: "parent",
+        type: "paragraph",
+        content: "Parent",
+        children: [{ id: "child", type: "paragraph", content: "Child" }],
+      },
+    ],
+  });
+  editor.mount(container);
+  cleanup.push(() => editor._tiptapEditor.destroy());
+  const view = editor.prosemirrorView;
+  cleanup.push(() => unsetDragImage(view.root));
+  const parent = getNodeById("parent", view.state.doc)!;
+  editor.transact((tr) =>
+    tr.setSelection(
+      MultipleNodeSelection.create(
+        tr.doc,
+        parent.posBeforeNode,
+        parent.posBeforeNode + parent.node.nodeSize,
+      ),
+    ),
+  );
+  editor
+    .getExtension(SideMenuExtension)!
+    .blockDragStart(
+      { dataTransfer: new DataTransfer(), clientY: 0 },
+      editor.getBlock("child")!,
+    );
+  expect(view.state.selection).toBeInstanceOf(MultipleNodeSelection);
+  expect(view.state.selection.content().content.firstChild?.attrs.id).toBe(
+    "child",
+  );
+});
+
 afterEach(() => {
   cleanup
     .splice(0)
 
@@ -183,7 +183,8 @@ export function dragStart<
     const draggedBlockInSelection = from <= pos && pos < to;
     const multipleBlocksSelected =
       selection.$anchor.node() !== selection.$head.node() ||
-      selection instanceof MultipleNodeSelection;
+      (selection instanceof MultipleNodeSelection &&
+        selection.nodes.length > 1);
 
     if (draggedBlockInSelection && multipleBlocksSelected) {
       view.dispatch(
 
@@ -69,6 +69,7 @@
     "@blocknote/core": "workspace:^",
     "@blocknote/react": "workspace:^",
     "@tiptap/core": "^3.31.3",
+    "@tiptap/pm": "^3.31.3",
     "prosemirror-model": "^1.25.11",
     "prosemirror-state": "^1.4.4",
     "prosemirror-view": "^1.42.5"
 
@@ -7,6 +7,7 @@ import {
   nodeToBlock,
 } from "@blocknote/core";
 import { UniqueID } from "@blocknote/core/extensions";
+import { closeHistory } from "@tiptap/pm/history";
 import type { Node } from "prosemirror-model";
 import { Plugin } from "prosemirror-state";
 import type { EditorView } from "prosemirror-view";
@@ -75,6 +76,10 @@ export function createMultiColumnHandleDropPlugin(
           return false; // Let ProseMirror handle empty slice drops
         }
         const draggedBlockIds = new Set(draggedBlocks.map((block) => block.id));
+        let lastDraggedBlock = draggedBlocks.at(-1)!;
+        while (lastDraggedBlock.children.length > 0) {
+          lastDraggedBlock = lastDraggedBlock.children.at(-1)!;
+        }
 
         if (blockInfo.blockNoteType === "column") {
           // The user is dropping the target column's entire contents on the
@@ -214,7 +219,7 @@ export function createMultiColumnHandleDropPlugin(
               });
             }
             // Keep typing at the dropped blocks, not their old position.
-            editor.setTextCursorPosition(draggedBlocks.at(-1)!, "end");
+            editor.setTextCursorPosition(lastDraggedBlock, "end");
           });
         } else {
           // Create new columnList with blocks as columns
@@ -255,10 +260,12 @@ export function createMultiColumnHandleDropPlugin(
                 },
               ],
             );
-            editor.setTextCursorPosition(draggedBlocks.at(-1)!, "end");
+            editor.setTextCursorPosition(lastDraggedBlock, "end");
           });
         }
 
+        // Close after the drop: the next keystroke must be a separate undo step.
+        editor.transact((tr) => closeHistory(tr));
         return true; // Prevent default ProseMirror drop behavior
       },
     },
 
@@ -1,4 +1,5 @@
 import { getNodeById } from "@blocknote/core";
+import { closeHistory } from "@tiptap/pm/history";
 import { Fragment, Slice } from "prosemirror-model";
 import { describe, expect, it, vi } from "vite-plus/test";
 
@@ -30,6 +31,36 @@ function dropOnEdge(ids: string[], target: string, position: "left" | "right") {
 }
 
 describe("column edge drops", () => {
+  it.each(["column-0", "paragraph-1"])(
+    "places the cursor in the final nested child when dropping beside %s",
+    (target) => {
+      const editor = getEditor();
+      dropOnEdge(["paragraph-0"], target, "right");
+      expect(editor.getTextCursorPosition().block.id).toBe(
+        "nested-paragraph-0",
+      );
+      expect(editor.prosemirrorState.selection.$from.parentOffset).toBe(
+        "Nested Paragraph 0".length,
+      );
+    },
+  );
+
+  it.each(["column-0", "paragraph-0"])(
+    "undoes immediate typing separately from the drop beside %s",
+    (target) => {
+      const editor = getEditor();
+      editor.transact((tr) => closeHistory(tr));
+      const before = editor.document;
+      dropOnEdge(["paragraph-1"], target, "right");
+      const dropped = editor.document;
+      editor.transact((tr) => tr.insertText("typed"));
+      expect(editor.undo()).toBe(true);
+      expect(editor.document).toEqual(dropped);
+      expect(editor.undo()).toBe(true);
+      expect(editor.document).toEqual(before);
+    },
+  );
+
   it.each(["left", "right"] as const)(
     "moves a mixed selection to an emptied target's %s edge",
     (edge) => {