diff --git a/apps/web/src/app.js b/apps/web/src/app.js
index 9f1747bf7..18baf2c94 100644
--- a/apps/web/src/app.js
+++ b/apps/web/src/app.js
@@ -86,6 +86,7 @@ function App() {
   const isSideMenuOpen = useStore(store => store.isSideMenuOpen);
   const refreshColors = useStore(store => store.refreshColors);
   const setSelectedContext = useNotesStore(store => store.setSelectedContext);
+
   useEffect(() => {
     RootNavigator.navigate(selectedKey);
     refreshColors();
diff --git a/apps/web/src/components/editor/index.js b/apps/web/src/components/editor/index.js
index 64771e342..f8e3c936c 100644
--- a/apps/web/src/components/editor/index.js
+++ b/apps/web/src/components/editor/index.js
@@ -28,6 +28,8 @@ function Editor() {
   const sessionState = useStore(store => store.session.state);
   const setSession = useStore(store => store.setSession);
   const saveSession = useStore(store => store.saveSession);
+  const reopenLastSession = useStore(store => store.reopenLastSession);
+
   useEffect(() => {
     // move the toolbar outside (easiest way)
     const toolbar = document.querySelector(".ql-toolbar.ql-snow");
@@ -37,6 +39,10 @@ function Editor() {
     }
   }, []);
 
+  useEffect(() => {
+    reopenLastSession();
+  }, [reopenLastSession]);
+
   return (
     <Flex width={["0%", "0%", "100%"]} sx={{ position: "relative" }}>
       <Flex className="editor" flex="1 1 auto" flexDirection="column">
diff --git a/apps/web/src/stores/editor-store.js b/apps/web/src/stores/editor-store.js
index fcc039d0c..eadb2348d 100644
--- a/apps/web/src/stores/editor-store.js
+++ b/apps/web/src/stores/editor-store.js
@@ -27,17 +27,27 @@ const DEFAULT_SESSION = {
   }
 };
 
+function saveLastOpenedNote(id) {
+  if (!id) return localStorage.removeItem("lastOpenedNote");
+  localStorage.setItem("lastOpenedNote", id);
+}
+
 function editorStore(set, get) {
   return {
     session: DEFAULT_SESSION,
+    reopenLastSession: function() {
+      const id = localStorage.getItem("lastOpenedNote");
+      if (!id) return;
+      get().openSession(db.notes.note(id).data);
+    },
     openSession: async function(note) {
+      clearTimeout(get().session.timeout);
       const content = {
         text: note.content.text,
         delta: await db.notes.note(note).delta()
       };
       noteStore.getState().setSelectedNote(note.id);
       set(state => {
-        clearTimeout(state.session.timeout);
         state.session = {
           ...DEFAULT_SESSION,
           id: note.id,
@@ -51,6 +61,7 @@ function editorStore(set, get) {
           state: SESSION_STATES.new
         };
       });
+      saveLastOpenedNote(note.id);
     },
     saveSession: function(oldSession) {
       set(state => {
@@ -73,41 +84,46 @@ function editorStore(set, get) {
           updateContext("colors", colors);
           appStore.getState().refreshColors();
         }
+        let notesState = noteStore.getState();
+        if (get().session.id === "") {
+          noteStore.getState().setSelectedNote(id);
+        }
+
         set(state => {
-          if (state.session.id === "") {
-            noteStore.getState().setSelectedNote(id);
-          }
           state.session.id = id;
           state.session.isSaving = false;
-          noteStore.getState().refresh();
-
-          // we update favorites only if favorite has changed
-          if (!oldSession || oldSession.favorite !== session.favorite) {
-            noteStore.getState().refreshList(LIST_TYPES.fav);
-          }
         });
+
+        notesState.refresh();
+        saveLastOpenedNote(id);
+
+        // we update favorites only if favorite has changed
+        if (!oldSession || oldSession.favorite !== session.favorite) {
+          notesState.refreshList(LIST_TYPES.fav);
+        }
       });
     },
     setSession: function(session) {
       const oldSession = get().session;
+      clearTimeout(oldSession.timeout);
       set(state => {
         state.session.state = SESSION_STATES.stale;
         session(state);
-        clearTimeout(state.session.timeout);
         state.session.timeout = setTimeout(() => {
           get().saveSession(oldSession);
         }, 500);
       });
     },
     newSession: function(context = {}) {
+      clearTimeout(get().session.timeout);
       set(state => {
-        clearTimeout(state.session.timeout);
         state.session = {
           ...DEFAULT_SESSION,
           ...context,
           state: SESSION_STATES.new
         };
       });
+      saveLastOpenedNote();
     },
     setColor: function(color) {
       setTagOrColor(get().session, "colors", color, "color", get().setSession);