diff --git a/qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.cpp b/qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.cpp
index 4e620aa24..52ee516d4 100644
--- a/qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.cpp
+++ b/qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.cpp
@@ -1010,7 +1010,7 @@ void GLPipelineStateViewer::setShaderState(const GLPipe::Shader &stage, RDLabel
   for(int i = 0; shaderDetails && i < shaderDetails->readWriteResources.count(); i++)
   {
     const ShaderResource &res = shaderDetails->readWriteResources[i];
-    int bindPoint = stage.bindpointMapping.readWriteResources[i].bind;
+    int bindPoint = stage.bindpointMapping.readWriteResources[res.bindPoint].bind;
 
     GLReadWriteType readWriteType = GetGLReadWriteType(res);