diff --git a/renderdocui/Windows/BufferViewer.cs b/renderdocui/Windows/BufferViewer.cs
index 1af5c5ebe..b8f48cfff 100644
--- a/renderdocui/Windows/BufferViewer.cs
+++ b/renderdocui/Windows/BufferViewer.cs
@@ -891,6 +891,9 @@ namespace renderdocui.Windows
                 if (rows * input.Strides[0] < size)
                     rows++;
 
+                if (rows > DefaultMaxRows)
+                    rows = DefaultMaxRows;
+
                 rowRange.Text = rows.ToString();
             }