diff --git a/frontend/src/index.js b/frontend/src/index.js
index 28592a4fe01255010457d4e46c7edf453e19adee..a3108a326bcf5590db5ae45e66cd20f96d037783 100644
--- a/frontend/src/index.js
+++ b/frontend/src/index.js
@@ -41,6 +41,8 @@ export default function App() {
   }, [reload]);
 
   useEffect(() => {
+    window.addEventListener("popstate", () => setReload(true));
+
     let path = window.location.pathname.split("/");
     if (restaurantsList && path.length >= 2 && path[1]) {
       let name = decodeURIComponent(path[1]);
@@ -48,7 +50,11 @@ export default function App() {
       if (filter) {
         setSelection(filter[0]);
       }
+    } else {
+      setSelection(null);
     }
+
+    return () => window.removeEventListener("popstate", () => setReload(true));
   }, [restaurantsList]);
 
   useEffect(() => {