diff --git a/app/static/js/app.js b/app/static/js/app.js
index 9f7bcff..f239784 100644
--- a/app/static/js/app.js
+++ b/app/static/js/app.js
@@ -321,10 +321,11 @@ document.addEventListener('DOMContentLoaded', async function() {
     // This updates the unread badges without blocking initial load
     checkForUpdates();  // No await - runs in background
 
-    // Geo cache loads in background - Map buttons will work once it completes
-    // No need to await - just let it finish whenever
+    // Geo cache loads in background - once loaded, re-render messages to show Map buttons
     geoCachePromise.then(() => {
-        console.log(`[init] Geo cache loaded in ${(performance.now() - initStart).toFixed(0)}ms`);
+        console.log(`[init] Geo cache loaded in ${(performance.now() - initStart).toFixed(0)}ms, refreshing messages for Map buttons`);
+        // Re-render messages now that geo cache is available (Map buttons will appear)
+        loadMessages();
     });
 });