diff --git a/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.cpp b/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.cpp
index f4f70c14b..fe1558301 100644
--- a/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.cpp
+++ b/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.cpp
@@ -2266,7 +2266,8 @@ void D3D12PipelineStateViewer::resource_itemActivated(RDTreeWidgetItem *item, in
       {
         uint32_t bind = (uint32_t)bindArray[i].bind;
         if(bindArray[i].bindset == view.space &&
-           (bind == view.res.bind || (bind <= view.res.bind && bind + arraySize > view.res.bind)))
+           (bind == view.res.bind ||
+            (bind <= view.res.bind && bind + bindArray[i].arraySize > view.res.bind)))
         {
           shaderRes = &resArray[i];
           break;