diff --git a/components/Home/Home.vue b/components/Home/Home.vue
index 058ca220..29005e59 100644
--- a/components/Home/Home.vue
+++ b/components/Home/Home.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import type { FitBoundsOptions, LngLatBounds } from 'maplibre-gl'
+import type { FitBoundsOptions, LngLatBounds, MapGeoJSONFeature } from 'maplibre-gl'
 import { storeToRefs } from 'pinia'
 import type { MultiPolygon, Polygon } from 'geojson'
 import { decodeBase32 } from 'geohashing'
@@ -43,7 +43,7 @@ const props = defineProps<{
 // Composables
 //
 const mapStore = useMapStore()
-const { center, isModeFavorites, isModeExplorer, isModeExplorerOrFavorites, mode, selectedFeature } = storeToRefs(mapStore)
+const { center, isModeFavorites, isModeExplorer, isModeExplorerOrFavorites, mode, selectedFeature, teritorioCluster } = storeToRefs(mapStore)
 const menuStore = useMenuStore()
 const { apiMenuCategory, features, selectedCategoryIds } = storeToRefs(menuStore)
 const favoriteStore = useFavoriteStore()
@@ -439,6 +439,8 @@ function toggleFavorite(feature: ApiPoi) {
 function searchSelectFeature(feature: ApiPoi) {
   mapStore.setSelectedFeature(feature)
   goToSelectedFeature()
+
+  teritorioCluster.value?.setSelectedFeature(feature as unknown as MapGeoJSONFeature)
 }
 
 const bottomMenuRef = ref<HTMLDivElement>()
diff --git a/components/MainMap/MapFeatures.vue b/components/MainMap/MapFeatures.vue
index 71054dbf..218cc190 100644
--- a/components/MainMap/MapFeatures.vue
+++ b/components/MainMap/MapFeatures.vue
@@ -248,7 +248,7 @@ export default defineNuxtComponent({
         pinMarkerRenderFn: pinMarkerRender,
       })
 
-      this.teritorioCluster.addEventListener('click', (e: Event) => this.updateSelectedFeature((e as CustomEvent).detail.selectedFeature))
+      this.teritorioCluster.addEventListener('feature-click', (e: Event) => this.updateSelectedFeature((e as CustomEvent).detail.selectedFeature))
 
       this.map.on('click', this.onClick)
 
diff --git a/package.json b/package.json
index 72dfda32..7cda06b6 100644
--- a/package.json
+++ b/package.json
@@ -37,7 +37,7 @@
     "@sentry/vue": "^8.35.0",
     "@tailwindcss/typography": "^0.5.9",
     "@teritorio/map": "^0.12.7",
-    "@teritorio/maplibre-gl-teritorio-cluster": "^0.0.11",
+    "@teritorio/maplibre-gl-teritorio-cluster": "^0.0.12",
     "@teritorio/openmaptiles-gl-language": "^1.5.4",
     "@turf/boolean-intersects": "^6.5.0",
     "@turf/mask": "^7.1.0",
diff --git a/yarn.lock b/yarn.lock
index 99d1ae64..8e3dbec5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3985,14 +3985,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@teritorio/maplibre-gl-teritorio-cluster@npm:^0.0.11":
-  version: 0.0.11
-  resolution: "@teritorio/maplibre-gl-teritorio-cluster@npm:0.0.11"
+"@teritorio/maplibre-gl-teritorio-cluster@npm:^0.0.12":
+  version: 0.0.12
+  resolution: "@teritorio/maplibre-gl-teritorio-cluster@npm:0.0.12"
   dependencies:
     "@turf/bbox": "npm:^7.1.0"
     "@turf/helpers": "npm:^7.1.0"
     maplibre-gl: "npm:^4.7.0"
-  checksum: 10c0/e4c9e0c5af4bb279ce324ad36c5be7d55dad2ee9b5af27e91c025dac156cd34c7ff984531726f9af5258cf592bbeef5128050755718ca8d10deb1cd90d136a8c
+  checksum: 10c0/f04440b42d9d5fa1374d512a29cef305f635e97dcfaec07c84e09facb885755c5bbce8c6ed2252e658bf58c7c38ff15fc552f9ac90296576b900ff7613cb0630
   languageName: node
   linkType: hard
 
@@ -4032,7 +4032,7 @@ __metadata:
     "@tailwindcss/typography": "npm:^0.5.9"
     "@teritorio/font-teritorio": "npm:^2.5.0"
     "@teritorio/map": "npm:^0.12.7"
-    "@teritorio/maplibre-gl-teritorio-cluster": "npm:^0.0.11"
+    "@teritorio/maplibre-gl-teritorio-cluster": "npm:^0.0.12"
     "@teritorio/openmaptiles-gl-language": "npm:^1.5.4"
     "@turf/boolean-intersects": "npm:^6.5.0"
     "@turf/mask": "npm:^7.1.0"