diff --git a/src/plugins/headings/index.ts b/src/plugins/headings/index.ts
index 544369e1..5ee95f64 100644
--- a/src/plugins/headings/index.ts
+++ b/src/plugins/headings/index.ts
@@ -1,6 +1,13 @@
 import { $createHeadingNode, HeadingNode } from '@lexical/rich-text'
 import { Cell } from '@mdxeditor/gurx'
-import { $createParagraphNode, COMMAND_PRIORITY_LOW, KEY_DOWN_COMMAND } from 'lexical'
+import {
+  $createParagraphNode,
+  $isLineBreakNode,
+  COMMAND_PRIORITY_LOW,
+  KEY_DOWN_COMMAND,
+  type ParagraphNode,
+  type RangeSelection
+} from 'lexical'
 import { realmPlugin } from '../../RealmWithPlugins'
 import { controlOrMeta } from '../../utils/detectMac'
 import {
@@ -14,6 +21,44 @@ import {
 import { LexicalHeadingVisitor } from './LexicalHeadingVisitor'
 import { MdastHeadingVisitor } from './MdastHeadingVisitor'
 
+function $isAtStartOfHeading(heading: HeadingNode, selection: RangeSelection | undefined): boolean {
+  if (selection === undefined || heading.isEmpty()) {
+    return false
+  }
+  const firstDescendant = heading.getFirstDescendant()
+  return firstDescendant !== null && selection.anchor.key === firstDescendant.getKey() && selection.anchor.offset === 0
+}
+
+function $splitAfterLineBreak(selection: RangeSelection | undefined): boolean {
+  return selection?.anchor.offset === 0 && $isLineBreakNode(selection.anchor.getNode().getPreviousSibling())
+}
+
+// Lexical treats any text offset 0 as the start of the heading, so Enter after a
+// Shift+Enter linebreak moves the heading onto the latter line.
+function $insertNewHeadingAfter(this: HeadingNode, selection?: RangeSelection, restoreSelection = true): ParagraphNode | HeadingNode {
+  const lastDescendant = this.getLastDescendant()
+  const isAtEnd =
+    !lastDescendant ||
+    (selection?.anchor.key === lastDescendant.getKey() && selection.anchor.offset === lastDescendant.getTextContentSize())
+  const splitAfterBreak = $splitAfterLineBreak(selection)
+  const newElement = isAtEnd || selection === undefined || splitAfterBreak ? $createParagraphNode() : $createHeadingNode(this.getTag())
+  const direction = this.getDirection()
+  newElement.setDirection(direction)
+  this.insertAfter(newElement, restoreSelection)
+  if ($isAtStartOfHeading(this, selection) && selection) {
+    const paragraph = $createParagraphNode()
+    paragraph.select()
+    this.replace(paragraph, true)
+  }
+  if (splitAfterBreak && selection) {
+    const lineBreak = selection.anchor.getNode().getPreviousSibling()
+    if ($isLineBreakNode(lineBreak)) {
+      lineBreak.remove()
+    }
+  }
+  return newElement
+}
+
 const FORMATTING_KEYS = ['Digit0', 'Digit1', 'Digit2', 'Digit3', 'Digit4', 'Digit5', 'Digit6']
 
 /**
@@ -80,6 +125,7 @@ export const headingsPlugin = realmPlugin<{
   allowedHeadingLevels?: readonly HEADING_LEVEL[]
 }>({
   init(realm, params) {
+    HeadingNode.prototype.insertNewAfter = $insertNewHeadingAfter
     realm.pubIn({
       [addActivePlugin$]: 'headings',
       [addImportVisitor$]: MdastHeadingVisitor,
diff --git a/src/test/headings.test.tsx b/src/test/headings.test.tsx
new file mode 100644
index 00000000..14704efd
--- /dev/null
+++ b/src/test/headings.test.tsx
@@ -0,0 +1,129 @@
+import { $createHeadingNode, $isHeadingNode } from '@lexical/rich-text'
+import { act, render } from '@testing-library/react'
+import { $createLineBreakNode, $createTextNode, $getRoot, $getSelection, $isRangeSelection, type LexicalEditor } from 'lexical'
+import React from 'react'
+import { describe, expect, it } from 'vitest'
+import { MDXEditor, type MDXEditorMethods } from '../'
+import { rootEditor$ } from '../plugins/core'
+import { headingsPlugin } from '../plugins/headings'
+import { realmPlugin } from '../RealmWithPlugins'
+
+// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+;(globalThis as any).IS_REACT_ACT_ENVIRONMENT = true
+
+function captureRootEditor() {
+  let editor: LexicalEditor | null = null
+  const plugin = realmPlugin({
+    postInit(realm) {
+      editor = realm.getValue(rootEditor$)
+    }
+  })
+  return {
+    plugin,
+    getEditor() {
+      if (editor === null) {
+        throw new Error('root editor was not captured')
+      }
+      return editor
+    }
+  }
+}
+
+function readTopLevelBlocks(editor: LexicalEditor) {
+  return editor.getEditorState().read(() => {
+    return $getRoot()
+      .getChildren()
+      .map((node) => ({
+        type: $isHeadingNode(node) ? node.getTag() : node.getType(),
+        text: node.getTextContent()
+      }))
+  })
+}
+
+describe('heading split with line break', () => {
+  it('keeps heading type on the original text when splitting after Shift+Enter', () => {
+    const captured = captureRootEditor()
+    const ref = React.createRef<MDXEditorMethods>()
+
+    render(<MDXEditor ref={ref} markdown="" plugins={[headingsPlugin(), captured.plugin()]} />)
+
+    const editor = captured.getEditor()
+
+    act(() => {
+      editor.update(
+        () => {
+          const second = $createTextNode('second')
+          $getRoot()
+            .clear()
+            .append($createHeadingNode('h1').append($createTextNode('first'), $createLineBreakNode(), second))
+          second.select(0, 0)
+          const selection = $getSelection()
+          if ($isRangeSelection(selection)) {
+            // KEY_ENTER / INSERT_PARAGRAPH_COMMAND both end in selection.insertParagraph().
+            // Discrete so jsdom does not discard the nested update before we assert.
+            selection.insertParagraph()
+          }
+        },
+        { discrete: true }
+      )
+    })
+
+    expect(readTopLevelBlocks(editor)).toEqual([
+      { type: 'h1', text: 'first' },
+      { type: 'paragraph', text: 'second' }
+    ])
+    expect(ref.current?.getMarkdown().trim()).toBe('# first\n\nsecond')
+  })
+
+  it('inserts a paragraph before a heading when Enter is pressed at the start', () => {
+    const captured = captureRootEditor()
+    render(<MDXEditor markdown="" plugins={[headingsPlugin(), captured.plugin()]} />)
+    const editor = captured.getEditor()
+
+    act(() => {
+      editor.update(
+        () => {
+          const text = $createTextNode('title')
+          $getRoot().clear().append($createHeadingNode('h1').append(text))
+          text.select(0, 0)
+          const selection = $getSelection()
+          if ($isRangeSelection(selection)) {
+            selection.insertParagraph()
+          }
+        },
+        { discrete: true }
+      )
+    })
+
+    expect(readTopLevelBlocks(editor)).toEqual([
+      { type: 'paragraph', text: '' },
+      { type: 'h1', text: 'title' }
+    ])
+  })
+
+  it('inserts a paragraph after a heading when Enter is pressed at the end', () => {
+    const captured = captureRootEditor()
+    render(<MDXEditor markdown="" plugins={[headingsPlugin(), captured.plugin()]} />)
+    const editor = captured.getEditor()
+
+    act(() => {
+      editor.update(
+        () => {
+          const text = $createTextNode('title')
+          $getRoot().clear().append($createHeadingNode('h1').append(text))
+          text.select(5, 5)
+          const selection = $getSelection()
+          if ($isRangeSelection(selection)) {
+            selection.insertParagraph()
+          }
+        },
+        { discrete: true }
+      )
+    })
+
+    expect(readTopLevelBlocks(editor)).toEqual([
+      { type: 'h1', text: 'title' },
+      { type: 'paragraph', text: '' }
+    ])
+  })
+})