diff --git a/qrenderdoc/Windows/BufferViewer.cpp b/qrenderdoc/Windows/BufferViewer.cpp
index 497a6c624..a615bc10a 100644
--- a/qrenderdoc/Windows/BufferViewer.cpp
+++ b/qrenderdoc/Windows/BufferViewer.cpp
@@ -1421,6 +1421,15 @@ void BufferViewer::OnEventChanged(uint32_t eventId)
       m_ModelVSOut->primRestart = m_ModelVSIn->primRestart;
     }
   }
+  else
+  {
+    QString errors;
+    QList<FormatElement> cols = FormatElement::ParseFormatString(m_Format, 0, true, errors);
+
+    ClearModels();
+
+    m_ModelVSIn->columns = cols;
+  }
 
   EnableCameraGuessControls();