diff --git a/cypress/e2e/diagramUpdate.spec.ts b/cypress/e2e/diagramUpdate.spec.ts
index 1de872b06..278767561 100644
--- a/cypress/e2e/diagramUpdate.spec.ts
+++ b/cypress/e2e/diagramUpdate.spec.ts
@@ -5,6 +5,7 @@ describe('Auto sync tests', () => {
     cy.clearLocalStorage();
     cy.visit('/');
     cy.url().should('contain', '/edit#pako');
+    cy.window().should('have.property', 'editorLoaded', true);
   });
 
   it('should dim diagram when code is edited', () => {
diff --git a/src/lib/components/Editor.svelte b/src/lib/components/Editor.svelte
index 427b0e4c7..62d0d4c6e 100644
--- a/src/lib/components/Editor.svelte
+++ b/src/lib/components/Editor.svelte
@@ -30,6 +30,7 @@
     const newText = editorMode === 'code' ? code : mermaid;
     if (newText !== text) {
       // console.log('updating editor text', newText);
+      editor.setScrollTop(0);
       editor.setValue(newText);
       text = newText;
     }
@@ -143,7 +144,12 @@
     if (divEl.parentElement) {
       resizeObserver.observe(divEl.parentElement);
     }
-    // console.log(`editor mounted`);
+
+    // @ts-ignore
+    if (window.Cypress) {
+      // @ts-ignore
+      window.editorLoaded = true;
+    }
     return () => {
       // console.log(`editor disposed`);
       editor?.dispose();