diff --git a/com.unity.render-pipelines.core/CHANGELOG.md b/com.unity.render-pipelines.core/CHANGELOG.md
index c52d9f511f7..8ab794d2070 100644
--- a/com.unity.render-pipelines.core/CHANGELOG.md
+++ b/com.unity.render-pipelines.core/CHANGELOG.md
@@ -46,6 +46,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Fix LookDev's undo/redo on EnvironmentLibrary (case 1234725)
 - Fix a compil error on OpenGL ES2 in directional lightmap sampling shader code
 - Fix hierarchicalbox gizmo outside facing check in symetry or homothety mode no longer move the center
+- Fixed a null ref in the volume component list when there is no volume components in the project.
 
 ### Changed
 - Restored usage of ENABLE_VR to fix compilation errors on some platforms.
diff --git a/com.unity.render-pipelines.core/Editor/FilterWindow.cs b/com.unity.render-pipelines.core/Editor/FilterWindow.cs
index 514b15fd672..44f06c95e32 100644
--- a/com.unity.render-pipelines.core/Editor/FilterWindow.cs
+++ b/com.unity.render-pipelines.core/Editor/FilterWindow.cs
@@ -455,8 +455,11 @@ void HandleKeyboard()
 
                     if (evt.keyCode == KeyCode.Return || evt.keyCode == KeyCode.KeypadEnter)
                     {
-                        GoToChild(m_ActiveElement, true);
-                        evt.Use();
+                        if (m_ActiveElement != null)
+                        {
+                            GoToChild(m_ActiveElement, true);
+                            evt.Use();
+                        }
                     }
 
                     // Do these if we're not in search mode