diff --git a/qrenderdoc/Windows/BufferViewer.cpp b/qrenderdoc/Windows/BufferViewer.cpp
index 4d1c60720..0882c547e 100644
--- a/qrenderdoc/Windows/BufferViewer.cpp
+++ b/qrenderdoc/Windows/BufferViewer.cpp
@@ -646,6 +646,7 @@ BufferViewer::BufferViewer(CaptureContext *ctx, QWidget *parent)
   memset(&m_Config.second, 0, sizeof(m_Config.second));
 
   ui->outputTabs->setCurrentIndex(0);
+  m_CurStage = eMeshDataStage_VSIn;
 
   QObject::connect(ui->vsinData->selectionModel(), &QItemSelectionModel::selectionChanged, this,
                    &BufferViewer::data_selected);
@@ -1067,6 +1068,8 @@ void BufferViewer::on_outputTabs_currentChanged(int index)
   else if(index == 2)
     m_CurStage = eMeshDataStage_GSOut;
 
+  UpdateMeshConfig();
+
   INVOKE_MEMFN(RT_UpdateAndDisplay);
 }