diff --git a/renderdocui/Windows/BufferViewer.cs b/renderdocui/Windows/BufferViewer.cs
index 563dd4d96..8ae2f3c3e 100644
--- a/renderdocui/Windows/BufferViewer.cs
+++ b/renderdocui/Windows/BufferViewer.cs
@@ -1882,12 +1882,13 @@ namespace renderdocui.Windows
 
                 ScrollToRow(bufView, RowOffset);
 
-                if (m_QueuedRowSelect != -1)
+                if (m_QueuedRowSelect != -1 && state.m_Stage == m_MeshDisplay.type)
                 {
                     ScrollToRow(bufView, m_QueuedRowSelect);
 
                     bufView.ClearSelection();
-                    bufView.Rows[m_QueuedRowSelect].Selected = true;
+                    if(m_QueuedRowSelect < bufView.RowCount)
+                        bufView.Rows[m_QueuedRowSelect].Selected = true;
 
                     SyncViews(bufView, true, true);