diff --git a/renderdocui/Windows/BufferViewer.cs b/renderdocui/Windows/BufferViewer.cs
index 40522f8fb..e77ef886d 100644
--- a/renderdocui/Windows/BufferViewer.cs
+++ b/renderdocui/Windows/BufferViewer.cs
@@ -567,15 +567,10 @@ namespace renderdocui.Windows
                     if (curReq != m_ReqID)
                         return;
 
-                    if (MeshView)
-                        UI_UpdateMeshRenderComponents();
-
                     m_VSIn.AbortThread();
                     m_VSOut.AbortThread();
                     m_GSOut.AbortThread();
 
-                    UI_SetAllColumns();
-
                     if (m_VSIn.m_Input != null)
                         UI_SetRowsData(MeshDataStage.VSIn, contentsVSIn, horizscroll[0]);
                     if (m_VSOut.m_Input != null)
@@ -583,6 +578,11 @@ namespace renderdocui.Windows
                     if (m_GSOut.m_Input != null)
                         UI_SetRowsData(MeshDataStage.GSOut, contentsGSOut, horizscroll[2]);
 
+                    if (MeshView)
+                        UI_UpdateMeshRenderComponents();
+
+                    UI_SetAllColumns();
+
                     camGuess_PropChanged();
 
                     render.Invalidate();
@@ -2271,7 +2271,7 @@ namespace renderdocui.Windows
                 else if (ui.m_Stage != MeshDataStage.VSIn && ui.m_Data != null && ui.m_Data.PostVS.buf != ResourceId.Null)
                 {
                     m_MeshDisplay.position.idxbuf = ui.m_Data.PostVS.idxbuf;
-                    m_MeshDisplay.position.idxoffs = ui.m_Input.Drawcall.indexOffset * ui.m_Data.PostVS.idxByteWidth;
+                    m_MeshDisplay.position.idxoffs = 0;
                     m_MeshDisplay.position.idxByteWidth = ui.m_Data.PostVS.idxByteWidth;
 
                     m_MeshDisplay.position.buf = ui.m_Data.PostVS.buf;