diff --git a/apps/web/src/components/editor/index.js b/apps/web/src/components/editor/index.js
index 3625c9d4f..f9458367d 100644
--- a/apps/web/src/components/editor/index.js
+++ b/apps/web/src/components/editor/index.js
@@ -26,6 +26,17 @@ import debounce from "just-debounce-it";
 
 const ReactMCE = React.lazy(() => import("./tinymce"));
 
+function editorSetContent(editor, content) {
+  editor.isLoading = true;
+
+  const editorScroll = document.querySelector(".editorScroll");
+  if (editorScroll) editorScroll.scrollTop = 0;
+
+  editor.setHTML(content);
+
+  updateWordCount(editor);
+}
+
 function updateWordCount(editor) {
   if (!editor.countWords) return;
   AppEventManager.publish(AppEvents.UPDATE_WORD_COUNT, editor.countWords());
@@ -71,39 +82,21 @@ function Editor({ noteId, nonce }) {
       content: { data },
     } = editorstore.get().session;
     const editor = editorRef.current?.editor;
-    if (!editor) return;
+    if (!editor || !editor.initialized) return;
 
     async function setContents() {
-      if (!editor.initialized) return;
-      editor.setContent(data, { format: "html" });
-
-      editor.undoManager.reset();
-      editor.setDirty(false);
+      editorSetContent(editor, data);
 
       editorstore.set((state) => (state.session.state = SESSION_STATES.stale));
       if (id) await db.attachments.downloadImages(id);
-
-      editor.focus();
     }
-
     setContents();
   }, []);
 
   const clearContent = useCallback(() => {
     const editor = editorRef.current?.editor;
-    console.log(editor);
-    if (!editor) return;
-
-    async function clearContents() {
-      if (!editor.initialized) return;
-      editor.setContent("<p><br/></p>", { format: "html" });
-      editor.undoManager.reset();
-      editor.setDirty(false);
-
-      editor.focus();
-    }
-
-    clearContents();
+    if (!editor || !editor.initialized) return;
+    editor.clearContent();
   }, []);
 
   useEffect(() => {
@@ -208,18 +201,19 @@ function Editor({ noteId, nonce }) {
                     onChange={(content, editor) => {
                       if (!content || content === "<p><br></pr>") return;
 
-                      setSession((state) => {
-                        state.session.content = {
-                          type: "tiny",
-                          data: content,
-                        };
+                      editorstore.get().setSessionContent({
+                        type: "tiny",
+                        data: content,
                       });
 
                       debouncedUpdateWordCount(editor);
                     }}
                     changeInterval={100}
                     onInit={(editor) => {
-                      editor.focus();
+                      if (sessionId && editorstore.get().session.contentId) {
+                        setContent();
+                      } else if (nonce) clearContent();
+
                       setTimeout(() => {
                         setIsEditorLoading(false);
                         // a short delay to make sure toolbar has rendered.
diff --git a/apps/web/src/stores/editor-store.js b/apps/web/src/stores/editor-store.js
index 6c53b3145..5bcaa7fef 100644
--- a/apps/web/src/stores/editor-store.js
+++ b/apps/web/src/stores/editor-store.js
@@ -204,11 +204,17 @@ class EditorStore extends BaseStore {
   };
 
   setSession = (set) => {
-    const oldSession = { ...this.get().session };
+    const oldSession = this.get().session;
     this.set(set);
     this.saveSession(oldSession);
   };
 
+  setSessionContent = (content) => {
+    const oldSession = this.get().session;
+    this.get().session.content = content;
+    this.saveSession(oldSession);
+  };
+
   toggleLocked = () => {
     if (this.get().session.locked) noteStore.unlock(this.get().session.id);
     else noteStore.lock(this.get().session.id);