diff --git a/renderdocui/Windows/BufferViewer.cs b/renderdocui/Windows/BufferViewer.cs
index e24eed375..46cd4f59b 100644
--- a/renderdocui/Windows/BufferViewer.cs
+++ b/renderdocui/Windows/BufferViewer.cs
@@ -1585,6 +1585,9 @@ namespace renderdocui.Windows
         {
             var bufView = state.m_GridView;
 
+            if (bufView.IsDisposed)
+                return;
+
             SuppressCaching = true;
 
             for (int i = 0; i < bufView.Columns.Count; i++)