diff --git a/routes/_components/Nav.html b/routes/_components/Nav.html
index b9b9e1fa..267b2ccf 100644
--- a/routes/_components/Nav.html
+++ b/routes/_components/Nav.html
@@ -1,6 +1,6 @@
 <nav class="main-nav">
 	<ul class="main-nav-ul">
-    {#each $navPages as navPage (navPage.name)}
+    {#each $navPages as navPage (navPage.href)}
       <li class="main-nav-li">
         <NavItem
           {page}
diff --git a/routes/_store/computations/navComputations.js b/routes/_store/computations/navComputations.js
index f0ee1573..e1f249ce 100644
--- a/routes/_store/computations/navComputations.js
+++ b/routes/_store/computations/navComputations.js
@@ -33,7 +33,7 @@ export function navComputations (store) {
         }
       } else if (pinnedPage.startsWith('/lists/')) {
         pinnedPageObject = {
-          name: 'lists',
+          name: `lists/${pinnedPage.split('/').slice(-1)[0]}`,
           href: pinnedPage,
           svg: '#fa-bars',
           label: pinnedListTitle
diff --git a/routes/lists/[listId].html b/routes/lists/[listId].html
index 72795525..3511a931 100644
--- a/routes/lists/[listId].html
+++ b/routes/lists/[listId].html
@@ -1,7 +1,7 @@
 <svelte:head>
   <title>Pinafore – List</title>
 </svelte:head>
-<Layout page='lists'>
+<Layout page='lists/{params.listId}'>
   <LazyPage {pageComponent} {params} />
 </Layout>
 <script>