diff --git a/renderdocui/Controls/TreeListView/TreeListView.cs b/renderdocui/Controls/TreeListView/TreeListView.cs
index 742ad2d4f..0a5d822ec 100644
--- a/renderdocui/Controls/TreeListView/TreeListView.cs
+++ b/renderdocui/Controls/TreeListView/TreeListView.cs
@@ -228,11 +228,22 @@ namespace TreelistView
 		{
 			m_tooltipTimer.Stop();
 
-			if(m_tooltipNode == null)
+			if (m_tooltipNode == null)
+			{
+				m_tooltip.Hide(this);
 				return;
+			}
 
 			Node node = m_tooltipNode;
 
+			Point p = PointToClient(Cursor.Position);
+
+			if (!ClientRectangle.Contains(p))
+			{
+				m_tooltip.Hide(this);
+				return;
+			}
+
 			int visibleRowIndex = CalcHitRow(PointToClient(Cursor.Position));
 
 			Rectangle rowRect = CalcRowRectangle(visibleRowIndex);