diff --git a/qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.cpp b/qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.cpp
index 07a13bc4a..9b9557176 100644
--- a/qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.cpp
+++ b/qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.cpp
@@ -922,7 +922,11 @@ void GLPipelineStateViewer::setShaderState(const GLPipe::Shader &stage, RDLabel
         {
           shaderCBuf = &bind;
           map = &mapping.constantBlocks[bind.bindPoint];
-          break;
+
+          // if this one is used, break immediately. Otherwise keep going to see if we find one that
+          // is used
+          if(map->used)
+            break;
         }
 
         idx++;