diff --git a/qrenderdoc/Windows/PipelineState/PipelineStateViewer.cpp b/qrenderdoc/Windows/PipelineState/PipelineStateViewer.cpp
index 60617c42c..9ab8b39d5 100644
--- a/qrenderdoc/Windows/PipelineState/PipelineStateViewer.cpp
+++ b/qrenderdoc/Windows/PipelineState/PipelineStateViewer.cpp
@@ -717,8 +717,6 @@ void PipelineStateViewer::EditShader(ShaderStage shaderType, ResourceId id,
                                      const ShaderReflection *shaderDetails,
                                      const QString &entryFunc, const rdcstrpairs &files)
 {
-  ANALYTIC_SET(UIFeatures.ShaderEditing, true);
-
   IShaderViewer *sv = m_Ctx.EditShader(
       false, entryFunc, files,
       // save callback
@@ -726,6 +724,8 @@ void PipelineStateViewer::EditShader(ShaderStage shaderType, ResourceId id,
                                                  const rdcstrpairs &updatedfiles) {
         QString compileSource = updatedfiles[0].second;
 
+        ANALYTIC_SET(UIFeatures.ShaderEditing, true);
+
         // try and match up #includes against the files that we have. This isn't always
         // possible as fxc only seems to include the source for files if something in
         // that file was included in the compiled output. So you might end up with