diff --git a/src/components/App.tsx b/src/components/App.tsx
index 9e4cb05d4..9c2c6a6fa 100644
--- a/src/components/App.tsx
+++ b/src/components/App.tsx
@@ -4499,7 +4499,8 @@ class App extends React.Component<AppProps, AppState> {
       this.createFrameElementOnPointerDown(pointerDownState);
     } else if (
       this.state.activeTool.type !== "eraser" &&
-      this.state.activeTool.type !== "hand"
+      this.state.activeTool.type !== "hand" &&
+      this.state.activeTool.type !== "mermaid"
     ) {
       this.createGenericElementOnPointerDown(
         this.state.activeTool.type,
diff --git a/src/data/restore.ts b/src/data/restore.ts
index 9316cfe49..d7d9830d3 100644
--- a/src/data/restore.ts
+++ b/src/data/restore.ts
@@ -67,6 +67,7 @@ export const AllowedExcalidrawActiveTools: Record<
   frame: true,
   embeddable: true,
   hand: true,
+  mermaid: true,
 };
 
 export type RestoredDataState = {
diff --git a/src/excalidraw-app/debug.ts b/src/excalidraw-app/debug.ts
index 6e439f1c8..38ba80508 100644
--- a/src/excalidraw-app/debug.ts
+++ b/src/excalidraw-app/debug.ts
@@ -131,5 +131,5 @@ export class Debug {
     };
   };
 }
-
+//@ts-ignore
 window.debug = Debug;