diff --git a/renderdoc/driver/shaders/spirv/spirv_processor.cpp b/renderdoc/driver/shaders/spirv/spirv_processor.cpp
index 66f39e751..f391c92e3 100644
--- a/renderdoc/driver/shaders/spirv/spirv_processor.cpp
+++ b/renderdoc/driver/shaders/spirv/spirv_processor.cpp
@@ -554,6 +554,19 @@ void Processor::RegisterOp(Iter it)
       }
     }
   }
+  else if(opdata.op == Op::ExecutionModeId)
+  {
+    OpExecutionModeId decoded(it);
+
+    for(auto entryIt = entries.begin(); entryIt != entries.end(); ++entryIt)
+    {
+      if(entryIt->id == decoded.entryPoint)
+      {
+        entryIt->executionModes.Register(decoded);
+        break;
+      }
+    }
+  }
   else if(opdata.op == Op::Variable)
   {
     OpVariable decoded(it);