diff --git a/manage.js b/manage.js
index bd3befed..6af717d6 100644
--- a/manage.js
+++ b/manage.js
@@ -61,11 +61,7 @@ function initGlobalEvents() {
   };
 
   // remember scroll position on normal history navigation
-  document.addEventListener('visibilitychange', () => {
-    if (document.visibilityState != 'visible') {
-      rememberScrollPosition();
-    }
-  });
+  window.onbeforeunload = rememberScrollPosition;
 
   for (const [className, checkbox] of [
     ['enabled-only', $('#manage.onlyEnabled')],