diff --git a/renderdocui/Interop/Enums.cs b/renderdocui/Interop/Enums.cs
index 56f6a0506..0e41e9392 100644
--- a/renderdocui/Interop/Enums.cs
+++ b/renderdocui/Interop/Enums.cs
@@ -539,6 +539,36 @@ namespace renderdoc
             return "Unknown Usage String";
         }
 
+        public static string Str(this ShaderStageType stage, APIPipelineStateType apitype)
+        {
+            if (apitype == APIPipelineStateType.D3D11)
+            {
+                switch (stage)
+                {
+                    case ShaderStageType.Vertex: return "Vertex";
+                    case ShaderStageType.Hull: return "Hull";
+                    case ShaderStageType.Domain: return "Domain";
+                    case ShaderStageType.Geometry: return "Geometry";
+                    case ShaderStageType.Pixel: return "Pixel";
+                    case ShaderStageType.Compute: return "Compute";
+                }
+            }
+            else if(apitype == APIPipelineStateType.OpenGL)
+            {
+                switch (stage)
+                {
+                    case ShaderStageType.Vertex: return "Vertex";
+                    case ShaderStageType.Tess_Control: return "Tess. Control";
+                    case ShaderStageType.Tess_Eval: return "Tess. Eval";
+                    case ShaderStageType.Geometry: return "Geometry";
+                    case ShaderStageType.Fragment: return "Fragment";
+                    case ShaderStageType.Compute: return "Compute";
+                }
+            }
+
+            return stage.ToString();
+        }
+
         public static string Str(this SystemAttribute systemValue)
         {
             switch (systemValue)
diff --git a/renderdocui/Windows/Dialogs/ConstantBufferPreviewer.cs b/renderdocui/Windows/Dialogs/ConstantBufferPreviewer.cs
index 7cbfceb47..2ea25808f 100644
--- a/renderdocui/Windows/Dialogs/ConstantBufferPreviewer.cs
+++ b/renderdocui/Windows/Dialogs/ConstantBufferPreviewer.cs
@@ -212,7 +212,7 @@ namespace renderdocui.Controls
             get
             {
                 return String.Format("{0} {1} {2}",
-                    Stage.ToString(),
+                    Stage.Str(m_Core != null ? m_Core.APIProps.pipelineType : APIPipelineStateType.D3D11),
                     m_Core == null || m_Core.APIProps.pipelineType == APIPipelineStateType.D3D11 ? "CB" : "UBO",
                     Slot);
             }
@@ -246,8 +246,7 @@ namespace renderdocui.Controls
 
             nameLabel.Text = BufferName;
 
-            slotLabel.Text = Stage.ToString();
-            slotLabel.Text += " Shader Slot " + Slot;
+            slotLabel.Text = Text;
         }
 
         private void variables_KeyDown(object sender, KeyEventArgs e)