diff --git a/qrenderdoc/Windows/ShaderViewer.cpp b/qrenderdoc/Windows/ShaderViewer.cpp
index 8fdb16755..d1e8d4a5a 100644
--- a/qrenderdoc/Windows/ShaderViewer.cpp
+++ b/qrenderdoc/Windows/ShaderViewer.cpp
@@ -3248,7 +3248,10 @@ const RDTreeWidgetItem *ShaderViewer::getVarFromPath(const rdcstr &path, ShaderV
 
             if(child->text(0) == root)
             {
-              const RDTreeWidgetItem *ret = getVarFromPath(path, child, var, swizzle);
+              VariableTag tag = item->tag().value<VariableTag>();
+
+              const RDTreeWidgetItem *ret =
+                  getVarFromPath(tag.absoluteRefPath + "." + path, child, var, swizzle);
               if(ret)
                 return ret;
             }