diff --git a/packages/core/src/commands/selectAll.ts b/packages/core/src/commands/selectAll.ts
index a63b5a76..15518ea2 100644
--- a/packages/core/src/commands/selectAll.ts
+++ b/packages/core/src/commands/selectAll.ts
@@ -1,4 +1,3 @@
-import { selectAll as originalSelectAll } from 'prosemirror-commands'
 import { RawCommands } from '../types'
 
 declare module '@tiptap/core' {
@@ -12,6 +11,9 @@ declare module '@tiptap/core' {
   }
 }
 
-export const selectAll: RawCommands['selectAll'] = () => ({ state, dispatch }) => {
-  return originalSelectAll(state, dispatch)
+export const selectAll: RawCommands['selectAll'] = () => ({ tr, commands }) => {
+  return commands.setTextSelection({
+    from: 0,
+    to: tr.doc.content.size,
+  })
 }
diff --git a/packages/core/src/extensions/keymap.ts b/packages/core/src/extensions/keymap.ts
index c1a62db0..9231f0c8 100644
--- a/packages/core/src/extensions/keymap.ts
+++ b/packages/core/src/extensions/keymap.ts
@@ -29,8 +29,7 @@ export const Keymap = Extension.create({
       'Mod-Backspace': () => handleBackspace(),
       Delete: () => handleDelete(),
       'Mod-Delete': () => handleDelete(),
-      // we don’t need a custom `selectAll` for now
-      // 'Mod-a': () => this.editor.commands.selectAll(),
+      'Mod-a': () => this.editor.commands.selectAll(),
     }
   },
 })