diff --git a/renderdocui/Windows/Dialogs/ConstantBufferPreviewer.cs b/renderdocui/Windows/Dialogs/ConstantBufferPreviewer.cs
index 60a7aee44..7cbfceb47 100644
--- a/renderdocui/Windows/Dialogs/ConstantBufferPreviewer.cs
+++ b/renderdocui/Windows/Dialogs/ConstantBufferPreviewer.cs
@@ -211,7 +211,10 @@ namespace renderdocui.Controls
         {
             get
             {
-                return String.Format("{0} CB {1}", Stage.ToString(), Slot);
+                return String.Format("{0} {1} {2}",
+                    Stage.ToString(),
+                    m_Core == null || m_Core.APIProps.pipelineType == APIPipelineStateType.D3D11 ? "CB" : "UBO",
+                    Slot);
             }
         }