diff --git a/libs/ui-lib/lib/common/components/ui/ClusterEventsToolbar.tsx b/libs/ui-lib/lib/common/components/ui/ClusterEventsToolbar.tsx
index ccbe81cbbd..5bb4001a66 100644
--- a/libs/ui-lib/lib/common/components/ui/ClusterEventsToolbar.tsx
+++ b/libs/ui-lib/lib/common/components/ui/ClusterEventsToolbar.tsx
@@ -32,6 +32,7 @@ import { useTranslation } from '../../hooks/use-translation-wrapper';
 import { isSelectEventChecked } from './utils';
 import { TFunction } from 'i18next';
 import { stringToJSON } from '../../utils';
+import { CustomToolbarFilter } from './CustomToolbarFilter';
 
 export type SeverityCountsType = { [severity in Event['severity']]: number };
 
@@ -218,7 +219,7 @@ const ClusterEventsToolbar = ({
     >
       <ToolbarContent>
         {entityKind === 'cluster' && (
-          <ToolbarFilter
+          <CustomToolbarFilter
             categoryName="Hosts"
             chips={hostChips}
             deleteChip={(_, chip) =>
@@ -261,7 +262,7 @@ const ClusterEventsToolbar = ({
                 )),
               ]}
             </Select>
-          </ToolbarFilter>
+          </CustomToolbarFilter>
         )}
 
         <ToolbarFilter
diff --git a/libs/ui-lib/lib/ocm/components/clusters/CustomToolbarFilter.tsx b/libs/ui-lib/lib/common/components/ui/CustomToolbarFilter.tsx
similarity index 100%
rename from libs/ui-lib/lib/ocm/components/clusters/CustomToolbarFilter.tsx
rename to libs/ui-lib/lib/common/components/ui/CustomToolbarFilter.tsx
diff --git a/libs/ui-lib/lib/ocm/components/clusters/ClustersListToolbar.tsx b/libs/ui-lib/lib/ocm/components/clusters/ClustersListToolbar.tsx
index 83484ddb37..d70996861c 100644
--- a/libs/ui-lib/lib/ocm/components/clusters/ClustersListToolbar.tsx
+++ b/libs/ui-lib/lib/ocm/components/clusters/ClustersListToolbar.tsx
@@ -27,7 +27,7 @@ import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
 import { Cluster } from '@openshift-assisted/types/assisted-installer-service';
 import { useDispatchDay1, useSelectorDay1 } from '../../store';
 import { selectClustersUIState } from '../../store/slices/clusters/selectors';
-import { CustomToolbarFilter } from './CustomToolbarFilter';
+import { CustomToolbarFilter } from '../../../common/components/ui/CustomToolbarFilter';
 
 export type ClusterFiltersType = {
   [key: string]: string[]; // value from clusterStatusLabels