diff --git a/renderdocui/Controls/TreeListView/TreeListView.cs b/renderdocui/Controls/TreeListView/TreeListView.cs
index c7fabe26a..b4319fd62 100644
--- a/renderdocui/Controls/TreeListView/TreeListView.cs
+++ b/renderdocui/Controls/TreeListView/TreeListView.cs
@@ -128,7 +128,13 @@ namespace TreelistView
         public int TreeColumn
         {
             get { return m_treeColumn; }
-            set { m_treeColumn = value; }
+            set
+            {
+                m_treeColumn = value;
+
+                if(value >= m_columns.Count)
+                    throw new ArgumentOutOfRangeException("Tree column index invalid");
+            }
         }
 
         [Category("Behavior")]
diff --git a/renderdocui/Windows/PipelineState/D3D11PipelineStateViewer.Designer.cs b/renderdocui/Windows/PipelineState/D3D11PipelineStateViewer.Designer.cs
index 1d60b442a..fc1c8aab6 100644
--- a/renderdocui/Windows/PipelineState/D3D11PipelineStateViewer.Designer.cs
+++ b/renderdocui/Windows/PipelineState/D3D11PipelineStateViewer.Designer.cs
@@ -2385,7 +2385,7 @@
             this.gsCBuffers.Size = new System.Drawing.Size(566, 113);
             this.gsCBuffers.TabIndex = 11;
             this.gsCBuffers.Text = "Samplers";
-            this.gsCBuffers.TreeColumn = 5;
+            this.gsCBuffers.TreeColumn = 4;
             this.gsCBuffers.ViewOptions.Indent = 0;
             this.gsCBuffers.ViewOptions.ShowLine = false;
             this.gsCBuffers.ViewOptions.ShowPlusMinus = false;