diff --git a/renderdocui/Windows/Dialogs/ConstantBufferPreviewer.cs b/renderdocui/Windows/Dialogs/ConstantBufferPreviewer.cs
index 8528a7ac2..7ddad0889 100644
--- a/renderdocui/Windows/Dialogs/ConstantBufferPreviewer.cs
+++ b/renderdocui/Windows/Dialogs/ConstantBufferPreviewer.cs
@@ -161,7 +161,7 @@ namespace renderdocui.Controls
 
         private void SetVariables(ShaderVariable[] vars)
         {
-            if (this.InvokeRequired)
+            if (this.InvokeRequired || variables.InvokeRequired)
             {
                 this.BeginInvoke(new Action(() => { SetVariables(vars); }));
                 return;