diff --git a/qrenderdoc/Code/Interface/PersistantConfig.cpp b/qrenderdoc/Code/Interface/PersistantConfig.cpp
index baa99dd00..3171cc086 100644
--- a/qrenderdoc/Code/Interface/PersistantConfig.cpp
+++ b/qrenderdoc/Code/Interface/PersistantConfig.cpp
@@ -698,7 +698,7 @@ ShaderProcessingTool::ShaderProcessingTool(const QVariant &var)
 rdcstr ShaderProcessingTool::DefaultArguments() const
 {
   if(tool == KnownShaderTool::SPIRV_Cross)
-    return "--output {output_file} {input_file} --vulkan-semantics";
+    return "--output {output_file} {input_file} --vulkan-semantics --entry {entry_point}";
   else if(tool == KnownShaderTool::spirv_dis)
     return "--no-color -o {output_file} {input_file}";
   else if(tool == KnownShaderTool::glslangValidatorGLSL)
diff --git a/qrenderdoc/Code/Interface/ShaderProcessingTool.cpp b/qrenderdoc/Code/Interface/ShaderProcessingTool.cpp
index 28ece6ecb..23ea59dd9 100644
--- a/qrenderdoc/Code/Interface/ShaderProcessingTool.cpp
+++ b/qrenderdoc/Code/Interface/ShaderProcessingTool.cpp
@@ -213,6 +213,12 @@ ShaderToolOutput ShaderProcessingTool::DisassembleShader(QWidget *window,
       arg = input_file;
     if(arg == lit("{output_file}"))
       arg = output_file = tmpPath(lit("shader_output"));
+    if(arg == lit("{entry_point}"))
+    {
+      arg = shaderDetails->entryPoint;
+      if(arg.isEmpty())
+        arg = lit("main");
+    }
 
     // allow substring matches from the left, to enable e.g. {hlsl_stage2}_6_0
     if(arg.left(13) == lit("{glsl_stage4}"))