diff --git a/app/components/navigation/MainNavigation.vue b/app/components/navigation/MainNavigation.vue
index caadb77..8cc677d 100644
--- a/app/components/navigation/MainNavigation.vue
+++ b/app/components/navigation/MainNavigation.vue
@@ -15,7 +15,7 @@
         <nav v-if="showModeToggle" class="flex items-center gap-1">
           <button
             class="px-3 py-1 text-sm font-medium rounded-lg transition-colors"
-            :class="catalogMode === 'explore'
+            :class="showActiveMode && catalogMode === 'explore'
               ? (glassStyle ? 'bg-white/20 text-white' : 'bg-base-300 text-base-content')
               : (glassStyle ? 'text-white/70 hover:text-white hover:bg-white/10' : 'text-base-content/70 hover:text-base-content hover:bg-base-200')"
             @click="$emit('set-catalog-mode', 'explore')"
@@ -24,7 +24,7 @@
           </button>
           <button
             class="px-3 py-1 text-sm font-medium rounded-lg transition-colors"
-            :class="catalogMode === 'quote'
+            :class="showActiveMode && catalogMode === 'quote'
               ? (glassStyle ? 'bg-white/20 text-white' : 'bg-base-300 text-base-content')
               : (glassStyle ? 'text-white/70 hover:text-white hover:bg-white/10' : 'text-base-content/70 hover:text-base-content hover:bg-base-200')"
             @click="$emit('set-catalog-mode', 'quote')"
@@ -301,6 +301,7 @@ const props = defineProps<{
   quantity?: string
   canSearch?: boolean
   showModeToggle?: boolean
+  showActiveMode?: boolean  // Whether to show active state on mode toggle
   // Glass style (transparent) for map pages
   glassStyle?: boolean
 }>()
diff --git a/app/layouts/topnav.vue b/app/layouts/topnav.vue
index a0d8ea7..c3f59e8 100644
--- a/app/layouts/topnav.vue
+++ b/app/layouts/topnav.vue
@@ -21,7 +21,8 @@
         :hub-label="hubLabel ?? undefined"
         :quantity="quantity"
         :can-search="canSearch"
-        :show-mode-toggle="isCatalogSection"
+        :show-mode-toggle="true"
+        :show-active-mode="isCatalogSection"
         :glass-style="isCatalogSection"
         @toggle-theme="toggleTheme"
         @set-catalog-mode="setCatalogMode"