diff --git a/src/pages/MainFeed.jsx b/src/pages/MainFeed.jsx
index f69f877..a8200dd 100644
--- a/src/pages/MainFeed.jsx
+++ b/src/pages/MainFeed.jsx
@@ -264,7 +264,10 @@ export default function MainFeed() {
             open={sidebarOpen}
             activeNav={activeNav}
             onClose={() => setSidebarOpen(false)}
-            onNavClick={setActiveNav}
+            onNavClick={(key) => {
+              setActiveNav(key);
+              if (isMapView || isSearchView) navigate("/feed");
+            }}
             isAuthenticated={isAuthenticated}
             onLoginClick={() => modals.open("auth")}
             onRulesClick={() => modals.open("rules")}
@@ -331,7 +334,10 @@ export default function MainFeed() {
                 isAuthenticated={isAuthenticated}
                 onProfileClick={() => modals.open("profile")}
                 onLoginClick={() => modals.open("auth")}
-                onNavClick={setActiveNav}
+            onNavClick={(key) => {
+              setActiveNav(key);
+              if (isMapView || isSearchView) navigate("/feed");
+            }}
             />
               </>
             )}