diff --git a/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.cpp b/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.cpp
index 1a63d288f..17d73b3c4 100644
--- a/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.cpp
+++ b/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.cpp
@@ -163,6 +163,8 @@ D3D11PipelineStateViewer::D3D11PipelineStateViewer(ICaptureContext &ctx,
                    &D3D11PipelineStateViewer::resource_itemActivated);
   QObject::connect(ui->csUAVs, &RDTreeWidget::itemActivated, this,
                    &D3D11PipelineStateViewer::resource_itemActivated);
+  QObject::connect(ui->gsStreamOut, &RDTreeWidget::itemActivated, this,
+                   &D3D11PipelineStateViewer::resource_itemActivated);
 
   for(RDTreeWidget *res : resources)
     QObject::connect(res, &RDTreeWidget::itemActivated, this,
@@ -2004,6 +2006,9 @@ void D3D11PipelineStateViewer::resource_itemActivated(RDTreeWidgetItem *item, in
   else if(buf)
   {
     D3D11ViewTag view;
+
+    view.res.resourceResourceId = buf->resourceId;
+
     if(tag.canConvert<D3D11ViewTag>())
       view = tag.value<D3D11ViewTag>();
 
diff --git a/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.cpp b/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.cpp
index b28295f7c..b3aedcd46 100644
--- a/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.cpp
+++ b/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.cpp
@@ -199,6 +199,8 @@ D3D12PipelineStateViewer::D3D12PipelineStateViewer(ICaptureContext &ctx,
 
   QObject::connect(ui->targetOutputs, &RDTreeWidget::itemActivated, this,
                    &D3D12PipelineStateViewer::resource_itemActivated);
+  QObject::connect(ui->gsStreamOut, &RDTreeWidget::itemActivated, this,
+                   &D3D12PipelineStateViewer::resource_itemActivated);
 
   for(RDTreeWidget *res : resources)
     QObject::connect(res, &RDTreeWidget::itemActivated, this,
@@ -1898,6 +1900,9 @@ void D3D12PipelineStateViewer::resource_itemActivated(RDTreeWidgetItem *item, in
   else if(buf)
   {
     D3D12ViewTag view;
+
+    view.res.resourceId = buf->resourceId;
+
     if(tag.canConvert<D3D12ViewTag>())
       view = tag.value<D3D12ViewTag>();