diff --git a/com.unity.render-pipelines.high-definition/CHANGELOG.md b/com.unity.render-pipelines.high-definition/CHANGELOG.md
index d9c8ca57739..80346c88767 100644
--- a/com.unity.render-pipelines.high-definition/CHANGELOG.md
+++ b/com.unity.render-pipelines.high-definition/CHANGELOG.md
@@ -98,6 +98,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Fixed the list of included HDRP asset used for stripping in the build process.
 - Fixed Show/Hide all Additional Properties
 - Fixed errors about incorrect color spaces in the console when using the Wizzard to fix the project setup (case 1388222).
+- Fixed custom pass name being cut when too long in the inspector.
 
 ## [14.0.0] - 2021-11-17
 
diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/CustomPass/CustomPassDrawer.cs b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/CustomPass/CustomPassDrawer.cs
index 4c2641acde5..113ebd9f9d3 100644
--- a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/CustomPass/CustomPassDrawer.cs
+++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/CustomPass/CustomPassDrawer.cs
@@ -204,7 +204,9 @@ void DoHeaderGUI(ref Rect rect)
 
             EditorGUI.BeginProperty(headerRect, GUIContent.none, m_PassFoldout);
             {
+                EditorGUIUtility.labelWidth = headerRect.width;
                 m_PassFoldout.boolValue = EditorGUI.Foldout(headerRect, m_PassFoldout.boolValue, $"{m_Name.stringValue} ({m_PassType.Name})", true, EditorStyles.boldLabel);
+                EditorGUIUtility.labelWidth = 0;
             }
             EditorGUI.EndProperty();
             EditorGUI.BeginProperty(enabledRect, Styles.enabled, m_Enabled);
diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/CustomPass/CustomPassListSearchWindow.cs b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/CustomPass/CustomPassListSearchWindow.cs
index 57d5f51b6c6..d5140584f26 100644
--- a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/CustomPass/CustomPassListSearchWindow.cs
+++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/CustomPass/CustomPassListSearchWindow.cs
@@ -50,7 +50,7 @@ public List<SearchTreeEntry> CreateSearchTree(SearchWindowContext context)
                 if (customPassType.GetCustomAttribute<HideInInspector>() != null)
                     continue;
 
-                tree.Add(new SearchTreeEntry(new GUIContent(customPassType.Name, icon))
+                tree.Add(new SearchTreeEntry(new GUIContent(ObjectNames.NicifyVariableName(customPassType.Name), icon))
                 {
                     level = 1,
                     userData = customPassType