diff --git a/server/TracyView.cpp b/server/TracyView.cpp
index 8d4a17b0..d77c5bf5 100644
--- a/server/TracyView.cpp
+++ b/server/TracyView.cpp
@@ -1854,6 +1854,7 @@ void View::DrawZones()
     m_msgHighlight.Decay( nullptr );
     m_zoneSrcLocHighlight.Decay( 0 );
     m_lockHoverHighlight.Decay( InvalidId );
+    m_zoneHover = nullptr;
 
     if( m_zvStart == m_zvEnd ) return;
     assert( m_zvStart < m_zvEnd );
@@ -2469,6 +2470,7 @@ int View::DrawZoneLevel( const Vector<ZoneEvent*>& vec, bool hover, double pxns,
                     }
 
                     m_zoneSrcLocHighlight = ev.srcloc;
+                    m_zoneHover = &ev;
                 }
             }
             char tmp[64];
@@ -2604,6 +2606,7 @@ int View::DrawZoneLevel( const Vector<ZoneEvent*>& vec, bool hover, double pxns,
                 }
 
                 m_zoneSrcLocHighlight = ev.srcloc;
+                m_zoneHover = &ev;
             }
 
             ++it;
diff --git a/server/TracyView.hpp b/server/TracyView.hpp
index ac28d1ae..10603af8 100644
--- a/server/TracyView.hpp
+++ b/server/TracyView.hpp
@@ -263,6 +263,7 @@ private:
     int m_memoryAllocHoverWait = 0;
     const FrameData* m_frames;
     uint32_t m_lockInfoWindow = InvalidId;
+    ZoneEvent* m_zoneHover = nullptr;
 
     Region m_highlight;
     Region m_highlightZoom;