diff --git a/renderdocui/Windows/EventBrowser.cs b/renderdocui/Windows/EventBrowser.cs
index d296efd02..6d9b248ac 100644
--- a/renderdocui/Windows/EventBrowser.cs
+++ b/renderdocui/Windows/EventBrowser.cs
@@ -301,7 +301,7 @@ namespace renderdocui.Windows
                     }
                 }
 
-                if(!found)
+                if (!found && !drawNode.Nodes.IsEmpty())
                     drawNode.Tag = drawNode.Nodes.LastNode.Tag;
             }