diff --git a/renderdoc/driver/d3d11/d3d11_analyse.cpp b/renderdoc/driver/d3d11/d3d11_analyse.cpp
index 914244854..72f70b954 100644
--- a/renderdoc/driver/d3d11/d3d11_analyse.cpp
+++ b/renderdoc/driver/d3d11/d3d11_analyse.cpp
@@ -577,8 +577,8 @@ ShaderDebug::State D3D11DebugManager::CreateShaderDebugState(ShaderDebugTrace &t
     trace.cbuffers[i] = vars;
 
     for(int32_t c = 0; c < trace.cbuffers[i].count; c++)
-      trace.cbuffers[i][c].name = StringFormat::Fmt("cb%u[%u] (%s)", (uint32_t)i, (uint32_t)c,
-                                                    trace.cbuffers[i][c].name.elems);
+      trace.cbuffers[i][c].name = StringFormat::Fmt("cb%u[%u] (%s)", dxbc->m_CBuffers[i].reg,
+                                                    (uint32_t)c, trace.cbuffers[i][c].name.elems);
   }
 
   initialState.Init();
diff --git a/renderdocui/Windows/ShaderViewer.cs b/renderdocui/Windows/ShaderViewer.cs
index 7fc578a73..cee52fded 100644
--- a/renderdocui/Windows/ShaderViewer.cs
+++ b/renderdocui/Windows/ShaderViewer.cs
@@ -485,10 +485,10 @@ namespace renderdocui.Windows
             {
                 for (int i = 0; i < m_ShaderDetails.ConstantBlocks.Length; i++)
                 {
-                    var stem = string.Format("cb{0}", i);
-
                     var cbuf = m_ShaderDetails.ConstantBlocks[i];
 
+                    var stem = string.Format("cb{0}", cbuf.bindPoint);
+
                     if (cbuf.variables.Length == 0)
                         continue;