diff --git a/qrenderdoc/Widgets/Extended/RDHeaderView.cpp b/qrenderdoc/Widgets/Extended/RDHeaderView.cpp
index a9bb73eaf..127b98b06 100644
--- a/qrenderdoc/Widgets/Extended/RDHeaderView.cpp
+++ b/qrenderdoc/Widgets/Extended/RDHeaderView.cpp
@@ -111,6 +111,8 @@ void RDHeaderView::cacheSections()
       QVariant v = m->data(m->index(0, col), m_columnGroupRole);
       if(v.isValid())
         m_sections[col].group = v.toInt();
+      else
+        m_sections[col].group = -m_columnGroupRole - col;
 
       if(col > 0)
       {
diff --git a/qrenderdoc/Windows/BufferViewer.cpp b/qrenderdoc/Windows/BufferViewer.cpp
index 4c1cecdac..698716387 100644
--- a/qrenderdoc/Windows/BufferViewer.cpp
+++ b/qrenderdoc/Windows/BufferViewer.cpp
@@ -2606,6 +2606,10 @@ void BufferViewer::Reset()
 
   ClearModels();
 
+  ui->vsinData->setColumnWidths({40, 40});
+  ui->vsoutData->setColumnWidths({40, 40});
+  ui->gsoutData->setColumnWidths({40, 40});
+
   m_BBoxes.clear();
 
   ICaptureContext *ctx = &m_Ctx;