diff --git a/src/components/FeedHeader/components/Controls/customRenders.tsx b/src/components/FeedHeader/components/Controls/customRenders.tsx
index 206ba8c..47fb886 100644
--- a/src/components/FeedHeader/components/Controls/customRenders.tsx
+++ b/src/components/FeedHeader/components/Controls/customRenders.tsx
@@ -40,7 +40,7 @@ export const renderSwitcher: RenderSwitcherType =
         />
     );
 
-export const renderFilter: SelectProps['renderFilter'] = ({value, onChange, onKeyDown, ref}) => (
+export const renderFilter: SelectProps['renderFilter'] = ({value, onChange, onKeyDown}) => (
     <TextInput
         controlProps={{size: 1}}
         value={value}
@@ -49,7 +49,6 @@ export const renderFilter: SelectProps['renderFilter'] = ({value, onChange, onKe
         onUpdate={onChange}
         onKeyDown={onKeyDown}
         className={b('popup-filter')}
-        ref={ref}
     />
 );
 
diff --git a/src/components/FeedHeader/components/CustomSwitcher/CustomSwitcher.tsx b/src/components/FeedHeader/components/CustomSwitcher/CustomSwitcher.tsx
index c65ed5f..255cb76 100644
--- a/src/components/FeedHeader/components/CustomSwitcher/CustomSwitcher.tsx
+++ b/src/components/FeedHeader/components/CustomSwitcher/CustomSwitcher.tsx
@@ -1,4 +1,4 @@
-import React, {LegacyRef, useMemo} from 'react';
+import React, {LegacyRef, MouseEvent, useMemo} from 'react';
 
 import {Icon, SelectProps} from '@gravity-ui/uikit';
 
@@ -42,6 +42,11 @@ export const CustomSwitcher = ({
     }, [defaultLabel, initial, list]);
     const hasCounter = itemsNames.length > 1;
 
+    const handleClick = (e: MouseEvent<HTMLDivElement>) => {
+        e.currentTarget.focus();
+        onClick?.();
+    };
+
     return (
         <button
             className={b('custom-switcher')}
@@ -49,7 +54,7 @@ export const CustomSwitcher = ({
             onKeyDown={onKeyDown}
             aria-expanded={open}
         >
-            <div onClick={onClick} className={b('custom-switcher-element', {overlay: true})} />
+            <div onClick={handleClick} className={b('custom-switcher-element', {overlay: true})} />
             <div className={b('custom-switcher-element', {content: true})}>
                 {itemsNames?.join(', ')}
             </div>