diff --git a/renderdocui/Windows/BufferViewer.cs b/renderdocui/Windows/BufferViewer.cs
index ad983f799..cd234cdb1 100644
--- a/renderdocui/Windows/BufferViewer.cs
+++ b/renderdocui/Windows/BufferViewer.cs
@@ -1553,6 +1553,11 @@ namespace renderdocui.Windows
         {
             var state = GetUIState(type);
 
+            var bufView = state.m_GridView;
+
+            if(bufView.IsDisposed)
+                return;
+
             // only do this once, VSIn is guaranteed to be set (even if it's empty data)
             if(type == MeshDataStage.VSIn)
                 CalcCellFloatWidth();
@@ -1562,8 +1567,6 @@ namespace renderdocui.Windows
             if(data.Buffers == null)
                 return;
 
-            var bufView = state.m_GridView;
-
             bufView.RowCount = 0;
             state.m_Data = data;