diff --git a/frontend/app/components/Dashboard/Widgets/CustomMetricsWidgets/ClickMapCard/ClickMapCard.tsx b/frontend/app/components/Dashboard/Widgets/CustomMetricsWidgets/ClickMapCard/ClickMapCard.tsx
index e8ff709c9..c77dbcd95 100644
--- a/frontend/app/components/Dashboard/Widgets/CustomMetricsWidgets/ClickMapCard/ClickMapCard.tsx
+++ b/frontend/app/components/Dashboard/Widgets/CustomMetricsWidgets/ClickMapCard/ClickMapCard.tsx
@@ -20,6 +20,7 @@ function ClickMapCard({
     const onMarkerClick = (s: string, innerText: string) => {
         metricStore.changeClickMapSearch(s, innerText)
     }
+    const mapUrl = metricStore.instance.series[0].filter.filters[0].value[0]
 
     React.useEffect(() => {
         return () => clearCurrentSession()
@@ -32,12 +33,10 @@ function ClickMapCard({
 
     React.useEffect(() => {
         if (visitedEvents.length) {
-            const urlOptions = visitedEvents.map(({ url, host }: any) => ({ label: url, value: url, host }))
-            const url = insightsFilters.url ? insightsFilters.url : host + urlOptions[0].value;
             const rangeValue = dashboardStore.drillDownPeriod.rangeValue
             const startDate = dashboardStore.drillDownPeriod.start
             const endDate = dashboardStore.drillDownPeriod.end
-            fetchInsights({ ...insightsFilters, url, startDate, endDate, rangeValue, clickRage: metricStore.clickMapFilter })
+            fetchInsights({ ...insightsFilters, url: mapUrl || '/', startDate, endDate, rangeValue, clickRage: metricStore.clickMapFilter })
         }
     }, [visitedEvents, metricStore.clickMapFilter])
 
@@ -62,9 +61,8 @@ function ClickMapCard({
         return <div className="py-2">Loading session</div>
     }
 
-    const searchUrl = metricStore.instance.series[0].filter.filters[0].value[0]
     const jumpToEvent = metricStore.instance.data.events.find((evt: Record<string, any>) => {
-        if (searchUrl) return evt.path.includes(searchUrl)
+        if (mapUrl) return evt.path.includes(mapUrl)
         return evt
     }) || { timestamp: metricStore.instance.data.startTs }
 
diff --git a/frontend/app/player/web/addons/TargetMarker.ts b/frontend/app/player/web/addons/TargetMarker.ts
index 6629ceaec..452ddd00f 100644
--- a/frontend/app/player/web/addons/TargetMarker.ts
+++ b/frontend/app/player/web/addons/TargetMarker.ts
@@ -240,7 +240,7 @@ export default class TargetMarker {
           })
         }
 
-        Object.assign(smallClicksBubble.style, clickmapStyles.clicks({ top, height, isRage: s.clickRage }))
+        Object.assign(smallClicksBubble.style, clickmapStyles.clicks({ top, height, isRage: s.clickRage, left }))
 
         border.appendChild(smallClicksBubble)
         overlay.appendChild(bubbleContainer)
diff --git a/frontend/app/player/web/addons/clickmapStyles.ts b/frontend/app/player/web/addons/clickmapStyles.ts
index 0ab795ea0..f0dc65a9c 100644
--- a/frontend/app/player/web/addons/clickmapStyles.ts
+++ b/frontend/app/player/web/addons/clickmapStyles.ts
@@ -16,7 +16,7 @@ export const clickmapStyles = {
   },
   bubbleContainer: ({ top, left, height }: { top: number; left: number, height: number }) => ({
     position: 'absolute',
-    top: top > 20 ? top + 'px' : height + 2 + 'px',
+    top: top > 75 ? top + 'px' : height+75 + 'px',
     width: '250px',
     left: `${left}px`,
     padding: '10px',
@@ -51,9 +51,9 @@ export const clickmapStyles = {
     position: 'absolute',
     zIndex,
   }),
-  clicks: ({ top, height, isRage }: { top: number; height: number, isRage?: boolean }) => ({
+  clicks: ({ top, height, isRage, left }: { top: number; height: number, isRage?: boolean, left: number }) => ({
     top: top > 20 ? 0 : `${height}px`,
-    left: 0,
+    left: left < 5 ? '100%' : 0,
     position: 'absolute',
     borderRadius: '999px',
     padding: '6px',