diff --git a/packages/web/components/nav-containers/home.tsx b/packages/web/components/nav-containers/home.tsx
index 1174b3334..4ff835594 100644
--- a/packages/web/components/nav-containers/home.tsx
+++ b/packages/web/components/nav-containers/home.tsx
@@ -40,7 +40,7 @@ export function HomeContainer(): JSX.Element {
   }, [viewerData])
 
   useEffect(() => {
-    window.sessionStorage.setItem('nav-return', router.asPath)
+    window.localStorage.setItem('nav-return', router.asPath)
   }, [router.asPath])
 
   return (
diff --git a/packages/web/components/patterns/LibraryCards/LibraryGridCard.tsx b/packages/web/components/patterns/LibraryCards/LibraryGridCard.tsx
index 857816954..8bba60f0b 100644
--- a/packages/web/components/patterns/LibraryCards/LibraryGridCard.tsx
+++ b/packages/web/components/patterns/LibraryCards/LibraryGridCard.tsx
@@ -95,7 +95,7 @@ export function LibraryGridCard(props: LinkedItemCardProps): JSX.Element {
           props.setIsChecked(props.item.id, !props.isChecked)
           return
         }
-        window.sessionStorage.setItem('nav-return', router.asPath)
+        window.localStorage.setItem('nav-return', router.asPath)
         if (event.metaKey || event.ctrlKey) {
           window.open(
             `/${props.viewer.profile.username}/${props.item.slug}`,
diff --git a/packages/web/components/patterns/LibraryCards/LibraryListCard.tsx b/packages/web/components/patterns/LibraryCards/LibraryListCard.tsx
index a7d277230..5fb5d00ab 100644
--- a/packages/web/components/patterns/LibraryCards/LibraryListCard.tsx
+++ b/packages/web/components/patterns/LibraryCards/LibraryListCard.tsx
@@ -100,7 +100,7 @@ export function LibraryListCard(props: LinkedItemCardProps): JSX.Element {
           props.setIsChecked(props.item.id, !props.isChecked)
           return
         }
-        window.sessionStorage.setItem('nav-return', router.asPath)
+        window.localStorage.setItem('nav-return', router.asPath)
         if (event.metaKey || event.ctrlKey) {
           window.open(
             `/${props.viewer.profile.username}/${props.item.slug}`,
diff --git a/packages/web/components/templates/SettingsLayout.tsx b/packages/web/components/templates/SettingsLayout.tsx
index a6716af9d..f1eb850cf 100644
--- a/packages/web/components/templates/SettingsLayout.tsx
+++ b/packages/web/components/templates/SettingsLayout.tsx
@@ -32,7 +32,7 @@ const ReturnButton = (): JSX.Element => {
         },
       }}
     >
-      <Link href="/home">
+      <Link href="/l/home">
         <HStack
           css={{
             pl: '20px',
diff --git a/packages/web/components/templates/article/PdfArticleContainer.tsx b/packages/web/components/templates/article/PdfArticleContainer.tsx
index dfbbcabf5..66ad4e20b 100644
--- a/packages/web/components/templates/article/PdfArticleContainer.tsx
+++ b/packages/web/components/templates/article/PdfArticleContainer.tsx
@@ -35,9 +35,8 @@ export default function PdfArticleContainer(
   const containerRef = useRef<HTMLDivElement | null>(null)
   const [notebookKey, setNotebookKey] = useState<string>(uuidv4())
   const [noteTarget, setNoteTarget] = useState<Highlight | undefined>(undefined)
-  const [noteTargetPageIndex, setNoteTargetPageIndex] = useState<
-    number | undefined
-  >(undefined)
+  const [noteTargetPageIndex, setNoteTargetPageIndex] =
+    useState<number | undefined>(undefined)
   const highlightsRef = useRef<Highlight[]>([])
 
   const annotationOmnivoreId = (annotation: Annotation): string | undefined => {
@@ -449,16 +448,16 @@ export default function PdfArticleContainer(
             document.dispatchEvent(new Event('openOriginalArticle'))
             break
           case 'u':
-            const navReturn = window.sessionStorage.getItem('nav-return')
+            const navReturn = window.localStorage.getItem('nav-return')
             if (navReturn) {
               window.location.assign(navReturn)
               return
             }
             const query = window.sessionStorage.getItem('q')
             if (query) {
-              window.location.assign(`/home?${query}`)
+              window.location.assign(`/l/home?${query}`)
             } else {
-              window.location.replace(`/home`)
+              window.location.replace(`/l/home`)
             }
             break
           case 'e':
diff --git a/packages/web/pages/[username]/[slug]/index.tsx b/packages/web/pages/[username]/[slug]/index.tsx
index 45d2f94c4..559f4f8d0 100644
--- a/packages/web/pages/[username]/[slug]/index.tsx
+++ b/packages/web/pages/[username]/[slug]/index.tsx
@@ -89,7 +89,7 @@ export default function Home(): JSX.Element {
     //     return
     //   }
     // }
-    const navReturn = window.sessionStorage.getItem('nav-return')
+    const navReturn = window.localStorage.getItem('nav-return')
     if (navReturn) {
       router.push(navReturn)
       return
@@ -303,7 +303,7 @@ export default function Home(): JSX.Element {
         name: 'Return to library',
         shortcut: ['u'],
         perform: () => {
-          const navReturn = window.sessionStorage.getItem('nav-return')
+          const navReturn = window.localStorage.getItem('nav-return')
           if (navReturn) {
             router.push(navReturn)
             return
diff --git a/packages/web/pages/_app.tsx b/packages/web/pages/_app.tsx
index e81880576..86f82fcce 100644
--- a/packages/web/pages/_app.tsx
+++ b/packages/web/pages/_app.tsx
@@ -43,12 +43,12 @@ const generateActions = (router: NextRouter) => {
       shortcut: ['g', 'h'],
       keywords: 'go home',
       perform: () => {
-        const navReturn = window.sessionStorage.getItem('nav-return')
+        const navReturn = window.localStorage.getItem('nav-return')
         if (navReturn) {
           router.push(navReturn)
           return
         }
-        router?.push('/home')
+        router?.push('/l/home')
       },
     },
     {
diff --git a/packages/web/pages/api/client/auth.ts b/packages/web/pages/api/client/auth.ts
index ee1d2dc01..e63d81767 100644
--- a/packages/web/pages/api/client/auth.ts
+++ b/packages/web/pages/api/client/auth.ts
@@ -29,7 +29,7 @@ const requestHandler = (req: NextApiRequest, res: NextApiResponse): void => {
     })
   } else {
     res.writeHead(302, {
-      Location: '/home',
+      Location: '/l/home',
     })
   }
 
diff --git a/packages/web/pages/index.tsx b/packages/web/pages/index.tsx
index 199614dc2..51b2b3b14 100644
--- a/packages/web/pages/index.tsx
+++ b/packages/web/pages/index.tsx
@@ -9,7 +9,12 @@ export default function LandingPage(): JSX.Element {
   const { viewerData, isLoading } = useGetViewerQuery()
 
   if (!isLoading && router.isReady && viewerData?.me) {
-    router.push('/home')
+    const navReturn = window.localStorage.getItem('nav-return')
+    if (navReturn) {
+      router.push(navReturn)
+    } else {
+      router.push('/l/home')
+    }
     return <></>
   } else if (isLoading || !router.isReady) {
     return (
diff --git a/packages/web/pages/tools/bulk.tsx b/packages/web/pages/tools/bulk.tsx
index 24efa499f..f1142d20b 100644
--- a/packages/web/pages/tools/bulk.tsx
+++ b/packages/web/pages/tools/bulk.tsx
@@ -202,7 +202,7 @@ export default function BulkPerformer(): JSX.Element {
             <VStack css={{ width: '100%' }} alignment="center">
               <Button
                 onClick={(e) => {
-                  window.location.href = '/home'
+                  window.location.href = '/l/home'
                   e.preventDefault()
                 }}
                 style="ctaDarkYellow"
diff --git a/packages/web/pages/tools/import/file.tsx b/packages/web/pages/tools/import/file.tsx
index a68a5d641..5e19efd20 100644
--- a/packages/web/pages/tools/import/file.tsx
+++ b/packages/web/pages/tools/import/file.tsx
@@ -240,7 +240,7 @@ export default function ImportUploader(): JSX.Element {
             {uploadState == 'completed' && (
               <Button
                 onClick={(e) => {
-                  window.location.href = '/home'
+                  window.location.href = '/l/home'
                   e.preventDefault()
                 }}
                 style="ctaDarkYellow"
diff --git a/packages/web/pages/tools/import/matter-archive.tsx b/packages/web/pages/tools/import/matter-archive.tsx
index a1cec1770..abf5cd1e1 100644
--- a/packages/web/pages/tools/import/matter-archive.tsx
+++ b/packages/web/pages/tools/import/matter-archive.tsx
@@ -190,7 +190,7 @@ export default function ImportUploader(): JSX.Element {
             <VStack css={{ width: '100%' }} alignment="center">
               <Button
                 onClick={(e) => {
-                  window.location.href = '/home'
+                  window.location.href = '/l/home'
                   e.preventDefault()
                 }}
                 style="ctaDarkYellow"