diff --git a/com.unity.render-pipelines.core/Editor/FilterWindow.cs b/com.unity.render-pipelines.core/Editor/FilterWindow.cs
index 74bdd3e1bbc..037752f1f2f 100644
--- a/com.unity.render-pipelines.core/Editor/FilterWindow.cs
+++ b/com.unity.render-pipelines.core/Editor/FilterWindow.cs
@@ -232,6 +232,8 @@ void OnDisable()
             s_FilterWindow = null;
         }
 
+        void OnLostFocus() => Close();
+
         internal static bool ValidateAddComponentMenuItem()
         {
             return true;
diff --git a/com.unity.render-pipelines.high-definition/CHANGELOG.md b/com.unity.render-pipelines.high-definition/CHANGELOG.md
index c3c49d2e5ae..80e4923bf19 100644
--- a/com.unity.render-pipelines.high-definition/CHANGELOG.md
+++ b/com.unity.render-pipelines.high-definition/CHANGELOG.md
@@ -89,6 +89,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Force probe to render again if first time was during async shader compilation to avoid having cyan objects.
 - Fixed for lookdev library field not being refreshed upon opening a library from the environment library inspector.
 - Fixed serialization issue with matcap scale intensity.
+- Close Add Override popup of Volume Inspector when the popup looses focus (case 1258571)
 
 ### Changed
 - Preparation pass for RTSSShadows to be supported by render graph.