diff --git a/src/lib/components/Editor.svelte b/src/lib/components/Editor.svelte
index 82826052..427b0e4c 100644
--- a/src/lib/components/Editor.svelte
+++ b/src/lib/components/Editor.svelte
@@ -1,46 +1,68 @@
 <script lang="ts">
-  import type { EditorEvents } from '$lib/types';
-  import { stateStore } from '$lib/util/state';
+  import type { EditorMode } from '$lib/types';
+  import { stateStore, updateCode, updateConfig } from '$lib/util/state';
   import { themeStore } from '$lib/util/theme';
-  import 'monaco-editor';
+  import { errorDebug, syncDiagram } from '$lib/util/util';
   import type monaco from 'monaco-editor';
-  import { createEventDispatcher, onMount } from 'svelte';
+  import { onMount } from 'svelte';
   import initEditor from 'monaco-mermaid';
+  import { logEvent } from '$lib/util/stats';
 
-  let divEl: HTMLDivElement;
-  let editor: monaco.editor.IStandaloneCodeEditor;
-  let Monaco: typeof monaco;
-
-  export let text: string;
-  export let language: string;
-  export let editorOptions: monaco.editor.IStandaloneEditorConstructionOptions = {
-    value: text,
-    language: language,
+  let divEl: HTMLDivElement | undefined = undefined;
+  let editor: monaco.editor.IStandaloneCodeEditor | undefined;
+  let Monaco: typeof monaco | undefined;
+  let editorOptions: monaco.editor.IStandaloneEditorConstructionOptions = {
     minimap: {
       enabled: false
     },
     theme: 'mermaid',
     overviewRulerLanes: 0
   };
-  let oldText = text;
-  $: editor && Monaco.editor.setModelLanguage(editor.getModel(), language);
-  $: {
-    if (text !== oldText) {
-      if (editor && $stateStore.updateEditor) {
-        editor.setValue(text);
-      }
-      oldText = text;
-    }
-    editor && Monaco.editor.setModelMarkers(editor.getModel(), 'test', $stateStore.errorMarkers);
-  }
+  let text = '';
 
-  themeStore.subscribe(({ isDark }) => {
-    editor && Monaco.editor.setTheme(isDark ? 'mermaid-dark' : 'mermaid');
+  stateStore.subscribe(({ errorMarkers, editorMode, code, mermaid }) => {
+    // console.log('editor store subscription', { code, mermaid });
+    if (!editor || !Monaco) {
+      return;
+    }
+
+    // Update editor text if it's different
+    const newText = editorMode === 'code' ? code : mermaid;
+    if (newText !== text) {
+      // console.log('updating editor text', newText);
+      editor.setValue(newText);
+      text = newText;
+    }
+
+    // Update editor mode if it's different
+    const language = editorMode === 'code' ? 'mermaid' : 'json';
+    const model = editor.getModel();
+    if (!model) {
+      console.error("editor model doesn't exist");
+      return;
+    }
+    if (model.getLanguageId() !== language) {
+      Monaco.editor.setModelLanguage(model, language);
+    }
+
+    // Display/clear errors
+    Monaco.editor.setModelMarkers(model, 'mermaid', errorMarkers);
   });
 
-  const dispatch = createEventDispatcher<EditorEvents>();
+  themeStore.subscribe(({ isDark }) => {
+    editor && Monaco?.editor.setTheme(isDark ? 'mermaid-dark' : 'mermaid');
+  });
 
-  onMount(async () => {
+  const handleUpdate = (text: string, mode: EditorMode) => {
+    // console.log('editor HandleUpdate', { text, mode });
+    if (mode === 'code') {
+      updateCode(text);
+    } else {
+      updateConfig(text);
+    }
+  };
+
+  const loadMonaco = async () => {
     // @ts-ignore
     self.MonacoEnvironment = {
       getWorker: function (workerId: string, label: string) {
@@ -76,27 +98,57 @@
     };
 
     Monaco = await import('monaco-editor');
+  };
+
+  onMount(async () => {
+    await loadMonaco(); // Fix https://github.com/mermaid-js/mermaid-live-editor/issues/175
+    if (!Monaco) {
+      throw new Error('Monaco failed to load');
+    }
+    if (!divEl) {
+      throw new Error('divEl is undefined');
+    }
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-call
     initEditor(Monaco);
+    errorDebug(100);
     editor = Monaco.editor.create(divEl, editorOptions);
-    editor.onDidChangeModelContent(() => {
-      text = editor.getValue();
-      dispatch('update', {
-        text
-      });
+    editor.onDidChangeModelContent(({ isFlush, changes }) => {
+      const newText = editor?.getValue();
+      // console.log('editor onDidChangeModelContent', { text, newText, isFlush, changes });
+      if (!newText || text === newText || isFlush) {
+        return;
+      }
+      text = newText;
+      handleUpdate(text, $stateStore.editorMode);
+    });
+    editor.addAction({
+      id: 'mermaid-render-diagram',
+      label: 'Render Diagram',
+      keybindings: [Monaco.KeyMod.CtrlCmd | Monaco.KeyCode.Enter],
+      run: function () {
+        syncDiagram();
+        logEvent('renderDiagram', {
+          method: 'keyboadShortcut'
+        });
+      }
     });
     Monaco.editor.setTheme($themeStore.isDark ? 'mermaid-dark' : 'mermaid');
     const resizeObserver = new ResizeObserver((entries) => {
-      editor.layout({
+      editor?.layout({
         height: entries[0].contentRect.height,
         width: entries[0].contentRect.width
       });
     });
 
-    resizeObserver.observe(divEl.parentElement);
+    if (divEl.parentElement) {
+      resizeObserver.observe(divEl.parentElement);
+    }
+    // console.log(`editor mounted`);
     return () => {
-      editor.dispose();
+      // console.log(`editor disposed`);
+      editor?.dispose();
     };
   });
 </script>
 
-<div bind:this={divEl} id="editor" class="overflow-hidden min-h-12" />
+<div bind:this={divEl} id="editor" class="overflow-hidden" />