diff --git a/packages/core/src/editor/BlockNoteEditor.ts b/packages/core/src/editor/BlockNoteEditor.ts
index 24cdaf8a55..6fbb3f815b 100644
--- a/packages/core/src/editor/BlockNoteEditor.ts
+++ b/packages/core/src/editor/BlockNoteEditor.ts
@@ -402,6 +402,10 @@ export class BlockNoteEditor<
       editorProps: {
         ...newOptions._tiptapOptions?.editorProps,
         attributes: {
+          // As of TipTap v2.5.0 the tabIndex is removed when the editor is not
+          // editable, so you can't focus it. We want to revert this as we have
+          // UI behaviour that relies on it.
+          tabIndex: "0",
           ...newOptions._tiptapOptions?.editorProps?.attributes,
           ...newOptions.domAttributes?.editor,
           class: mergeCSSClasses(