diff --git a/public/app/plugins/panel/geomap/utils/tootltip.ts b/public/app/plugins/panel/geomap/utils/tootltip.ts index 07c75dd0c5b..703f96009dd 100644 --- a/public/app/plugins/panel/geomap/utils/tootltip.ts +++ b/public/app/plugins/panel/geomap/utils/tootltip.ts @@ -32,9 +32,12 @@ export const pointerMoveListener = (evt: MapBrowserEvent, panel: Geo if (panel.state.measureMenuActive) { return true; } - if (!panel.map || panel.state.ttipOpen) { + + // Eject out of this function if map is not loaded or valid tooltip is already open + if (!panel.map || (panel.state.ttipOpen && panel.state?.ttip?.layers?.length)) { return false; } + const mouse = evt.originalEvent; const pixel = panel.map.getEventPixel(mouse); const hover = toLonLat(panel.map.getCoordinateFromPixel(pixel));