diff --git a/static/index.html b/static/index.html
index 5699739..dcf4bf5 100644
--- a/static/index.html
+++ b/static/index.html
@@ -2339,15 +2339,19 @@
     // TAB SWITCHING
     // =========================================================================
     function switchTab(tabId) {
+      const wasNavigating = AppState.currentTab === 'tabNavigate';
       // Track previous tab for back navigation
-      if (AppState.currentTab !== tabId && AppState.currentTab !== 'tabNavigate') {
+      if (AppState.currentTab !== tabId && !wasNavigating) {
         AppState._prevTab = AppState.currentTab;
       }
-      // Cleanup nav page when leaving
-      if (AppState.currentTab === 'tabNavigate' && tabId !== 'tabNavigate') {
+      // Update current tab BEFORE cleanup to prevent recursion
+      // when closeNavigate() calls switchTab()
+      AppState.currentTab = tabId;
+      // Cleanup nav page when leaving (closeNavigate only resets nav state,
+      // it does NOT switch panels — we must NOT return early here)
+      if (wasNavigating && tabId !== 'tabNavigate') {
         closeNavigate();
       }
-      AppState.currentTab = tabId;
 
       // Update tab panels
       document.querySelectorAll('.tab-panel').forEach(p => p.classList.remove('active'));
@@ -3681,8 +3685,13 @@
     function closeNavigate() {
       if (navMap) { navMap.remove(); navMap = null; }
       AppState._navData = null;
-      // Go back to previous tab or asset list
-      switchTab(AppState._prevTab || 'tabAssets');
+      // Reset navigate tab UI — does NOT switch tabs, caller handles that
+      const infoCard = document.getElementById('navInfoCard');
+      if (infoCard) infoCard.style.display = 'none';
+      const directionsCard = document.getElementById('navDirectionsCard');
+      if (directionsCard) directionsCard.style.display = 'none';
+      const gmapsLink = document.getElementById('navGoogleMapsLink');
+      if (gmapsLink) gmapsLink.style.display = 'none';
     }
 
     function clearRouteLine() {
diff --git a/tests/test_map_api.db-shm b/tests/test_map_api.db-shm
new file mode 100644
index 0000000..fe9ac28
Binary files /dev/null and b/tests/test_map_api.db-shm differ
diff --git a/tests/test_map_api.db-wal b/tests/test_map_api.db-wal
new file mode 100644
index 0000000..e69de29