diff --git a/renderdoc/driver/shaders/spirv/spirv_editor.cpp b/renderdoc/driver/shaders/spirv/spirv_editor.cpp
index 39193c9cd..4f03039cf 100644
--- a/renderdoc/driver/shaders/spirv/spirv_editor.cpp
+++ b/renderdoc/driver/shaders/spirv/spirv_editor.cpp
@@ -186,6 +186,8 @@ void Editor::DecorateStorageBufferStruct(Id id)
   // set bufferblock if needed
   if(m_StorageBufferClass == rdcspv::StorageClass::Uniform)
     AddDecoration(rdcspv::OpDecorate(id, rdcspv::Decoration::BufferBlock));
+  else
+    AddDecoration(rdcspv::OpDecorate(id, rdcspv::Decoration::Block));
 }
 
 void Editor::SetName(Id id, const rdcstr &name)