diff --git a/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.cpp b/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.cpp
index 8217e1059..3f0dab906 100644
--- a/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.cpp
+++ b/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.cpp
@@ -2558,6 +2558,17 @@ void VulkanPipelineStateViewer::exportHTML(QXmlStreamWriter &xml, const VKPipe::
       if(!bindMap.used)
         continue;
 
+      // push constants
+      if(!b.bufferBacked)
+      {
+        // could maybe get range/size from ShaderVariable.reg if it's filled out
+        // from SPIR-V side.
+        rows.push_back({QString(), b.name, tr("Push constants"), (qulonglong)0, (qulonglong)0,
+                        b.variables.count, b.byteSize});
+
+        continue;
+      }
+
       const VKPipe::DescriptorSet &set =
           pipeline.DescSets[sh.BindpointMapping.ConstantBlocks[i].bindset];
       const VKPipe::DescriptorBinding &bind =
@@ -2599,19 +2610,6 @@ void VulkanPipelineStateViewer::exportHTML(QXmlStreamWriter &xml, const VKPipe::
         if(name.isEmpty())
           name = tr("UBO %1").arg(ToQStr(descriptorBind.res));
 
-        // push constants
-        if(!b.bufferBacked)
-        {
-          setname = QString();
-          slotname = b.name;
-          name = tr("Push constants");
-          byteOffset = 0;
-          length = 0;
-
-          // could maybe get range/size from ShaderVariable.reg if it's filled out
-          // from SPIR-V side.
-        }
-
         rows.push_back({setname, slotname, name, (qulonglong)byteOffset, (qulonglong)length,
                         numvars, b.byteSize});
       }