diff --git a/renderdoc/driver/shaders/dxbc/dxbc_disassemble.cpp b/renderdoc/driver/shaders/dxbc/dxbc_disassemble.cpp
index f55eb814e..3b6dbd9b5 100644
--- a/renderdoc/driver/shaders/dxbc/dxbc_disassemble.cpp
+++ b/renderdoc/driver/shaders/dxbc/dxbc_disassemble.cpp
@@ -334,7 +334,15 @@ void DXBCFile::DisassembleHexDump()
     if(IsDeclaration(op))
       numDecls++;
 
-    tmp += Opcode::Length.Get(OpcodeToken0);
+    if(op == OPCODE_CUSTOMDATA)
+    {
+      // length in opcode token is 0, full length is in second dword
+      tmp += tmp[1];
+    }
+    else
+    {
+      tmp += Opcode::Length.Get(OpcodeToken0);
+    }
   }
 
   m_Declarations.reserve(numDecls);