diff --git a/app/composables/useCatalogSearch.ts b/app/composables/useCatalogSearch.ts
index caea158..0f08f2f 100644
--- a/app/composables/useCatalogSearch.ts
+++ b/app/composables/useCatalogSearch.ts
@@ -157,6 +157,13 @@ export function useCatalogSearch() {
     return 'hero'
   })
 
+  // Check if we're on the main page (not /catalog)
+  const localePath = useLocalePath()
+  const isMainPage = computed(() => {
+    const catalogPath = localePath('/catalog')
+    return !route.path.startsWith(catalogPath)
+  })
+
   // Navigation helpers
   const updateQuery = (updates: Partial<LocationQuery>) => {
     const newQuery = { ...route.query }
@@ -169,7 +176,12 @@ export function useCatalogSearch() {
       }
     })
 
-    router.push({ query: newQuery })
+    // If on main page and adding filters, navigate to /catalog
+    if (isMainPage.value && Object.keys(newQuery).length > 0) {
+      router.push({ path: localePath('/catalog'), query: newQuery })
+    } else {
+      router.push({ query: newQuery })
+    }
   }
 
   const startSelect = (type: SelectMode) => {
@@ -197,7 +209,11 @@ export function useCatalogSearch() {
   }
 
   const clearAll = () => {
-    router.push({ query: {} })
+    if (isMainPage.value) {
+      router.push({ path: localePath('/catalog'), query: {} })
+    } else {
+      router.push({ query: {} })
+    }
   }
 
   // Text search (for filtering within current grid)
diff --git a/app/pages/index.vue b/app/pages/index.vue
index fc07b32..c816b89 100644
--- a/app/pages/index.vue
+++ b/app/pages/index.vue
@@ -1,13 +1,44 @@
 <template>
-  <div></div>
+  <CatalogPage
+    :items="[]"
+    :loading="false"
+    :total-count="0"
+    :with-map="false"
+    map-id="main-catalog-map"
+  >
+    <template #searchBar>
+      <UnifiedSearchBar
+        :active-tokens="activeTokens"
+        :available-chips="availableChips"
+        :select-mode="selectMode"
+        :search-query="searchQuery"
+        @start-select="startSelect"
+        @cancel-select="cancelSelect"
+        @edit-token="editFilter"
+        @remove-token="removeFilter"
+        @update:search-query="searchQuery = $event"
+      />
+    </template>
+
+    <template #empty>
+      <CatalogHero @start-select="startSelect" />
+    </template>
+  </CatalogPage>
 </template>
 
-<script setup>
-// Redirect to unified catalog
+<script setup lang="ts">
 definePageMeta({
   layout: 'topnav'
 })
 
-const localePath = useLocalePath()
-await navigateTo(localePath('/catalog'), { replace: true })
+const {
+  selectMode,
+  searchQuery,
+  activeTokens,
+  availableChips,
+  startSelect,
+  cancelSelect,
+  removeFilter,
+  editFilter
+} = useCatalogSearch()
 </script>