From 0f66a5e61ffd2d1ebd5a3e407935a79867fb216c Mon Sep 17 00:00:00 2001
From: "Taras.Hlukhovetskyi" <taras.hlukhovetskyi@globallogic.com>
Date: Wed, 3 Jan 2024 13:54:01 +0200
Subject: [PATCH] Fix [Filter] Tag list doesnt scroll in Filter by dialog

---
 src/common/FormTagFilter/formTagFilters.scss      | 1 +
 src/components/FilterMenuModal/FilterMenuModal.js | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/common/FormTagFilter/formTagFilters.scss b/src/common/FormTagFilter/formTagFilters.scss
index c0c83e2fa..8aad33778 100644
--- a/src/common/FormTagFilter/formTagFilters.scss
+++ b/src/common/FormTagFilter/formTagFilters.scss
@@ -38,6 +38,7 @@
   &__dropdown {
     width: 100%;
     max-height: 400px;
+    align-items: normal;
     overflow-y: auto;
     background-color: $white;
     border: $primaryBorder;
diff --git a/src/components/FilterMenuModal/FilterMenuModal.js b/src/components/FilterMenuModal/FilterMenuModal.js
index 0f90eb50e..9a199ddff 100644
--- a/src/components/FilterMenuModal/FilterMenuModal.js
+++ b/src/components/FilterMenuModal/FilterMenuModal.js
@@ -81,7 +81,12 @@ const FilterMenuModal = ({
   }, [dispatch, filtersData, filterMenuName, values])
 
   const hideFiltersWizard = useCallback(event => {
-    if (!event.target.closest('.filters-button') && !event.target.closest('.filters-wizard')) {
+    if (
+      !event.target.closest('.filters-button') &&
+      !event.target.closest('.filters-wizard') &&
+      !event.target.parentNode.previousElementSibling?.classList?.contains('filters-wizard') &&
+      !event.target.parentNode.nextElementSibling?.classList?.contains('filters-wizard')
+    ) {
       setFiltersWizardIsShown(false)
     }
   }, [])