diff --git a/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.cpp b/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.cpp
index bcfbb5ebd..2340c6680 100644
--- a/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.cpp
+++ b/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.cpp
@@ -472,7 +472,7 @@ void VulkanPipelineStateViewer::setEmptyRow(RDTreeWidgetItem *node)
 
 template <typename bindType>
 bool VulkanPipelineStateViewer::setViewDetails(RDTreeWidgetItem *node, const bindType &view,
-                                               TextureDescription *tex,
+                                               TextureDescription *tex, bool stageBitsIncluded,
                                                const QString &hiddenCombinedSampler,
                                                bool includeSampleLocations)
 {
@@ -485,6 +485,11 @@ bool VulkanPipelineStateViewer::setViewDetails(RDTreeWidgetItem *node, const bin
 
   const VKPipe::State &state = *m_Ctx.CurVulkanPipelineState();
 
+  if(!stageBitsIncluded)
+  {
+    text += tr("Descriptor stage mask didn't include this stage.\n\n");
+  }
+
   {
     for(const VKPipe::ImageData &im : state.images)
     {
@@ -562,7 +567,7 @@ bool VulkanPipelineStateViewer::setViewDetails(RDTreeWidgetItem *node, const bin
 
   node->setToolTip(text);
 
-  if(viewdetails)
+  if(viewdetails && stageBitsIncluded)
   {
     node->setBackgroundColor(QColor(127, 255, 212));
     node->setForegroundColor(QColor(0, 0, 0));
@@ -573,13 +578,16 @@ bool VulkanPipelineStateViewer::setViewDetails(RDTreeWidgetItem *node, const bin
 
 template <typename bindType>
 bool VulkanPipelineStateViewer::setViewDetails(RDTreeWidgetItem *node, const bindType &view,
-                                               BufferDescription *buf)
+                                               BufferDescription *buf, bool stageBitsIncluded)
 {
   if(buf == NULL)
     return false;
 
   QString text;
 
+  if(!stageBitsIncluded)
+    text += tr("Descriptor stage mask didn't include this stage.\n\n");
+
   if(view.byteOffset > 0 || view.byteSize < buf->length)
   {
     text += tr("The view covers bytes %1-%2.\nThe buffer is %3 bytes in length.")
@@ -587,14 +595,18 @@ bool VulkanPipelineStateViewer::setViewDetails(RDTreeWidgetItem *node, const bin
                 .arg(view.byteOffset + view.byteSize)
                 .arg(buf->length);
   }
-  else
+  else if(stageBitsIncluded)
   {
     return false;
   }
 
   node->setToolTip(text);
-  node->setBackgroundColor(QColor(127, 255, 212));
-  node->setForegroundColor(QColor(0, 0, 0));
+
+  if(stageBitsIncluded)
+  {
+    node->setBackgroundColor(QColor(127, 255, 212));
+    node->setForegroundColor(QColor(0, 0, 0));
+  }
 
   return true;
 }
@@ -1051,6 +1063,8 @@ void VulkanPipelineStateViewer::addResourceRow(ShaderReflection *shaderDetails,
       filledSlot |= (*slotBinds)[idx].samplerResourceId != ResourceId();
   }
 
+  bool containsResource = filledSlot;
+
   // if it's masked out by stage bits, act as if it's not filled, so it's marked in red
   if(!stageBitsIncluded)
     filledSlot = false;
@@ -1135,7 +1149,7 @@ void VulkanPipelineStateViewer::addResourceRow(ShaderReflection *shaderDetails,
 
       uint64_t descriptorLen = descriptorBind ? descriptorBind->byteSize : 0;
 
-      if(filledSlot && descriptorBind != NULL)
+      if(containsResource && descriptorBind != NULL)
       {
         format = descriptorBind->viewFormat.Name();
 
@@ -1362,7 +1376,8 @@ void VulkanPipelineStateViewer::addResourceRow(ShaderReflection *shaderDetails,
                       .arg(m_Ctx.GetResourceName(descriptorBind->samplerResourceId))
                 : QString();
 
-        bool hasViewDetails = setViewDetails(node, *descriptorBind, tex, samplerString);
+        bool hasViewDetails =
+            setViewDetails(node, *descriptorBind, tex, stageBitsIncluded, samplerString);
 
         if(bindType == BindType::ImageSampler && hasViewDetails)
         {
@@ -1380,7 +1395,7 @@ void VulkanPipelineStateViewer::addResourceRow(ShaderReflection *shaderDetails,
       }
       else if(descriptorBind && buf)
       {
-        setViewDetails(node, *descriptorBind, buf);
+        setViewDetails(node, *descriptorBind, buf, stageBitsIncluded);
       }
 
       parentNode->addChild(node);
@@ -1448,6 +1463,8 @@ void VulkanPipelineStateViewer::addConstantBlockRow(ShaderReflection *shaderDeta
     filledSlot |=
         (*slotBinds)[idx].resourceResourceId != ResourceId() || (*slotBinds)[idx].inlineBlock;
 
+  bool containsResource = filledSlot;
+
   // if it's masked out by stage bits, act as if it's not filled, so it's marked in red
   if(!stageBitsIncluded)
     filledSlot = false;
@@ -1520,7 +1537,7 @@ void VulkanPipelineStateViewer::addConstantBlockRow(ShaderReflection *shaderDeta
 
       QString vecrange = lit("-");
 
-      if(filledSlot && descriptorBind != NULL)
+      if(containsResource && descriptorBind != NULL)
       {
         length = descriptorBind->byteSize;
 
@@ -2435,7 +2452,7 @@ void VulkanPipelineStateViewer::setState()
           targets[i] = true;
         }
 
-        setViewDetails(node, p, tex, QString(), resIdx < 0);
+        setViewDetails(node, p, tex, true, QString(), resIdx < 0);
 
         ui->fbAttach->addTopLevelItem(node);
       }
diff --git a/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.h b/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.h
index 437300c78..5aebd11ae 100644
--- a/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.h
+++ b/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.h
@@ -113,10 +113,12 @@ private:
 
   template <typename viewType>
   bool setViewDetails(RDTreeWidgetItem *node, const viewType &view, TextureDescription *tex,
-                      const QString &hiddenCombinedSampler, bool includeSampleLocations = false);
+                      bool stageBitsIncluded, const QString &hiddenCombinedSampler,
+                      bool includeSampleLocations = false);
 
   template <typename viewType>
-  bool setViewDetails(RDTreeWidgetItem *node, const viewType &view, BufferDescription *buf);
+  bool setViewDetails(RDTreeWidgetItem *node, const viewType &view, BufferDescription *buf,
+                      bool stageBitsIncluded);
 
   bool showNode(bool usedSlot, bool filledSlot);