diff --git a/renderdocui/Windows/BufferViewer.cs b/renderdocui/Windows/BufferViewer.cs
index bf9cc29f0..61145d13a 100644
--- a/renderdocui/Windows/BufferViewer.cs
+++ b/renderdocui/Windows/BufferViewer.cs
@@ -2218,6 +2218,9 @@ namespace renderdocui.Windows
 
                     i += (int)el.format.compCount;
 
+                    if(i > grid.ColumnCount)
+                        break;
+
                     Rectangle stringBounds = Rectangle.Empty;
                     for (int f = baseCol; f < i; f++)
                     {