diff --git a/src/frontend/src/components/editors/NotesEditor.tsx b/src/frontend/src/components/editors/NotesEditor.tsx
index 7f1920ac9a..826b62a16d 100644
--- a/src/frontend/src/components/editors/NotesEditor.tsx
+++ b/src/frontend/src/components/editors/NotesEditor.tsx
@@ -13,6 +13,40 @@ import type { ModelType } from '@lib/enums/ModelType';
 import { apiUrl } from '@lib/functions/Api';
 import { useApi } from '../../contexts/ApiContext';
 
+import '@blocknote/core/fonts/inter.css';
+import { BlockNoteView } from '@blocknote/mantine';
+import '@blocknote/mantine/style.css';
+import { useCreateBlockNote } from '@blocknote/react';
+import { Paper } from '@mantine/core';
+import { useUserState } from '../../states/UserState';
+
+export default function NotesEditor({
+  modelType,
+  modelId,
+  editable,
+  setDirtyCallback
+}: Readonly<{
+  modelType: ModelType;
+  modelId: number;
+  editable?: boolean;
+  setDirtyCallback?: (dirty: boolean) => void;
+}>) {
+  const user = useUserState();
+
+  const canEdit = useMemo(
+    () => user.hasChangePermission(modelType),
+    [user, modelType]
+  );
+
+  const editor = useCreateBlockNote();
+
+  return (
+    <Paper p='md' shadow='sm' withBorder>
+      <BlockNoteView editor={editor} editable={canEdit} />
+    </Paper>
+  );
+}
+
 /*
  * A text editor component for editing notes against a model type and instance.
  * Uses the react-simple-mde editor: https://github.com/RIP21/react-simplemde-editor
@@ -22,7 +56,7 @@ import { useApi } from '../../contexts/ApiContext';
  * - Allow image resizing in the future (requires back-end validation changes))
  * - Allow user to configure the editor toolbar (i.e. hide some buttons if they don't want them)
  */
-export default function NotesEditor({
+export function OldNotesEditor({
   modelType,
   modelId,
   editable,
diff --git a/src/frontend/src/components/panels/NotesPanel.tsx b/src/frontend/src/components/panels/NotesPanel.tsx
index 66696384bb..fcfb7501b3 100644
--- a/src/frontend/src/components/panels/NotesPanel.tsx
+++ b/src/frontend/src/components/panels/NotesPanel.tsx
@@ -4,10 +4,10 @@ import { IconNotes } from '@tabler/icons-react';
 
 import type { ModelType } from '@lib/enums/ModelType';
 import type { PanelType } from '@lib/types/Panel';
-import { lazy } from 'react';
 import { useUserState } from '../../states/UserState';
+import NotesEditor from '../editors/NotesEditor';
 
-const NotesEditor = lazy(() => import('../editors/NotesEditor'));
+// const NotesEditor = lazy(() => import('../editors/NotesEditor'));
 
 export default function NotesPanel({
   model_type,