diff --git a/renderdoc/driver/shaders/spirv/spirv_editor.cpp b/renderdoc/driver/shaders/spirv/spirv_editor.cpp
index 988b7fe00..b24b15309 100644
--- a/renderdoc/driver/shaders/spirv/spirv_editor.cpp
+++ b/renderdoc/driver/shaders/spirv/spirv_editor.cpp
@@ -272,6 +272,9 @@ void Editor::SetName(Id id, const rdcstr &name)
       break;
   }
 
+  if(End(Section::DebugNames) < it)
+    it = End(Section::DebugNames);
+
   InsertOperation(op, it.offs());
 }