diff --git a/renderdocui/Windows/BufferViewer.cs b/renderdocui/Windows/BufferViewer.cs
index a7b791d4f..f191febcc 100644
--- a/renderdocui/Windows/BufferViewer.cs
+++ b/renderdocui/Windows/BufferViewer.cs
@@ -3465,7 +3465,8 @@ namespace renderdocui.Windows
 
                 if (scroll)
                 {
-                    if (g.RowCount > 0 && g.RowCount > primary.FirstDisplayedScrollingRowIndex)
+                    if (g.RowCount > 0 && primary.FirstDisplayedScrollingRowIndex >= 0 &&
+                        g.RowCount > primary.FirstDisplayedScrollingRowIndex)
                         g.FirstDisplayedScrollingRowIndex = primary.FirstDisplayedScrollingRowIndex;
                 }
             }