diff --git a/renderdocui/Windows/BufferViewer.cs b/renderdocui/Windows/BufferViewer.cs
index 146cf9e98..b6916c03e 100644
--- a/renderdocui/Windows/BufferViewer.cs
+++ b/renderdocui/Windows/BufferViewer.cs
@@ -3081,7 +3081,7 @@ namespace renderdocui.Windows
             }
 
             if (primary == null)
-                return;
+                primary = vsInBufferView;
 
             foreach (DataGridView g in grids)
             {