diff --git a/src/components/AddressBar.astro b/src/components/AddressBar.astro
index d4b8887..fc54336 100644
--- a/src/components/AddressBar.astro
+++ b/src/components/AddressBar.astro
@@ -9,7 +9,7 @@ const placeholder = 'Type the URL of an article here';
 
 <div class="address-bar">
   <form>
-    <button aria-label="Home" title="Home" class="left-button" type="button" id="app-home" name="app-home" onclick="history.back();" hidden>
+    <button aria-label="Home" title="Home" class="left-button" type="button" id="app-home" name="app-home" onclick="history.go(-1); return false;" hidden>
       <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="currentColor" d="M17.51 3.87L15.73 2.1L5.84 12l9.9 9.9l1.77-1.77L9.38 12l8.13-8.13z"/></svg>
     </button>
     <input type="text" id="app-url" name="url" value={url} placeholder={placeholder} />
diff --git a/src/components/Library.astro b/src/components/Library.astro
index ceb1fad..09af494 100644
--- a/src/components/Library.astro
+++ b/src/components/Library.astro
@@ -75,19 +75,19 @@ const {postDivSelector, skipSave = false} = Astro.props;
       });
     });
 
-    window.onpopstate = async (data) => {
+    window.addEventListener('popstate', async (data) => {
       let url = data.state?.url;
 
       if (!url) {
         url = window.location.href;
       }
 
-        const fullResponse = await cache.match(url)
-        fullResponse?.text().then(data => {
-          const responseText = data;
-          renderPost(responseText, url, postDivSelector?.value, true);
-        });
-    }
+      const fullResponse = await cache.match(url)
+      fullResponse?.text().then(data => {
+        const responseText = data;
+        renderPost(responseText, url, postDivSelector?.value, true);
+      });
+    });
   }
 </script>
 
diff --git a/src/pages/index.astro b/src/pages/index.astro
index 9559143..a7008c5 100644
--- a/src/pages/index.astro
+++ b/src/pages/index.astro
@@ -32,6 +32,7 @@ if (url === '') {
     content: "<p>Enter a URL above to get started.</p>",
     url: '/'
   };
+  skipSave = false;
 }
 
 ---
diff --git a/src/utils/library.ts b/src/utils/library.ts
index 57cf3ed..8903eb9 100644
--- a/src/utils/library.ts
+++ b/src/utils/library.ts
@@ -77,6 +77,8 @@ export function renderPost(responseText, url, postDivSelector: string, preventPu
               const cozyUrl = html.querySelector('meta[property="cozy:url"]')?.getAttribute('content');
               if(cozyUrl !== '/') {
                 appUrl.value = cozyUrl || '';
+              } else {
+                appUrl.value = '';
               }
               if(!preventPushState) {
                 window.history.pushState({url}, '', url);