diff --git a/packages/vkui/src/components/ChipsSelect/ChipsSelect.tsx b/packages/vkui/src/components/ChipsSelect/ChipsSelect.tsx
index c6a6481f62..749423e8c4 100644
--- a/packages/vkui/src/components/ChipsSelect/ChipsSelect.tsx
+++ b/packages/vkui/src/components/ChipsSelect/ChipsSelect.tsx
@@ -31,7 +31,7 @@ import {
   isNotServicePreset,
   renderOptionDefault,
 } from './constants';
-import type { FocusActionType, OptionPreset } from './types';
+import type { FocusActionType } from './types';
 import { useChipsSelect, type UseChipsSelectProps } from './useChipsSelect';
 import styles from './ChipsSelect.module.css';
 
@@ -40,37 +40,6 @@ const stylesDropdownVerticalPlacement = {
   bottom: styles['ChipsSelect--pop-down'],
 } as const;
 
-const findIndexAfter = <O extends ChipOption>(
-  options: Array<OptionPreset<O>> = [],
-  startIndex = -1,
-) => {
-  if (startIndex >= options.length - 1) {
-    return -1;
-  }
-  return options.findIndex(
-    (option, i) => i > startIndex && (!isNotServicePreset(option) || !option.disabled),
-  );
-};
-
-const findIndexBefore = <O extends ChipOption>(
-  options: Array<OptionPreset<O>> = [],
-  endIndex: number = options.length,
-) => {
-  let result = -1;
-  if (endIndex <= 0) {
-    return result;
-  }
-  for (let i = endIndex - 1; i >= 0; i--) {
-    let option = options[i];
-
-    if (!isNotServicePreset(option) || !option.disabled) {
-      result = i;
-      break;
-    }
-  }
-  return result;
-};
-
 export interface ChipsSelectProps<O extends ChipOption>
   extends ChipsInputBaseProps<O>,
     UseChipsSelectProps<O>,
@@ -283,12 +252,6 @@ export const ChipsSelect = <Option extends ChipOption>({
       return;
     }
 
-    const option = options[index];
-
-    if (isNotServicePreset(option) && option.disabled) {
-      return;
-    }
-
     scrollToElement(index);
     setFocusedOptionIndex(index);
   };
@@ -297,11 +260,9 @@ export const ChipsSelect = <Option extends ChipOption>({
     let index = nextIndex === null ? -1 : nextIndex;
 
     if (type === FOCUS_ACTION_NEXT) {
-      const nextIndex = findIndexAfter(options, index);
-      index = nextIndex === -1 ? findIndexAfter(options) : nextIndex; // Следующий за index или первый валидный до index
+      index = index >= options.length - 1 ? 0 : ++index;
     } else if (type === FOCUS_ACTION_PREV) {
-      const beforeIndex = findIndexBefore(options, index);
-      index = beforeIndex === -1 ? findIndexBefore(options) : beforeIndex; // Предшествующий index или последний валидный после index
+      index = index <= 0 ? options.length - 1 : --index;
     }
 
     focusOptionByIndex(index, focusedOptionIndex);
@@ -337,7 +298,7 @@ export const ChipsSelect = <Option extends ChipOption>({
         }
         if (focusedOptionIndex != null) {
           const foundOption = options[focusedOptionIndex];
-          if (foundOption && isNotServicePreset(foundOption)) {
+          if (foundOption && isNotServicePreset(foundOption) && !foundOption.disabled) {
             event.preventDefault();
 
             if (onChangeStart) {
diff --git a/packages/vkui/src/components/CustomSelect/CustomSelect.tsx b/packages/vkui/src/components/CustomSelect/CustomSelect.tsx
index 3d0dcbb2bc..c5e7b0bed4 100644
--- a/packages/vkui/src/components/CustomSelect/CustomSelect.tsx
+++ b/packages/vkui/src/components/CustomSelect/CustomSelect.tsx
@@ -30,32 +30,6 @@ const sizeYClassNames = {
   ['compact']: styles['CustomSelect--sizeY-compact'],
 };
 
-const findIndexAfter = (options: CustomSelectOptionInterface[] = [], startIndex = -1) => {
-  if (startIndex >= options.length - 1) {
-    return -1;
-  }
-  return options.findIndex((option, i) => i > startIndex && !option.disabled);
-};
-
-const findIndexBefore = (
-  options: CustomSelectOptionInterface[] = [],
-  endIndex: number = options.length,
-) => {
-  let result = -1;
-  if (endIndex <= 0) {
-    return result;
-  }
-  for (let i = endIndex - 1; i >= 0; i--) {
-    let option = options[i];
-
-    if (!option.disabled) {
-      result = i;
-      break;
-    }
-  }
-  return result;
-};
-
 const warn = warnOnce('CustomSelect');
 
 const checkOptionsValueType = <T extends CustomSelectOptionInterface>(options: T[]) => {
@@ -339,12 +313,6 @@ export function CustomSelect<OptionInterfaceT extends CustomSelectOptionInterfac
         return;
       }
 
-      const option = options[index];
-
-      if (option?.disabled) {
-        return;
-      }
-
       if (scrollTo) {
         scrollToElement(index);
       }
@@ -416,6 +384,10 @@ export function CustomSelect<OptionInterfaceT extends CustomSelectOptionInterfac
     (index: number) => {
       const item = options[index];
 
+      if (item.disabled) {
+        return;
+      }
+
       setNativeSelectValue(item?.value);
       close();
 
@@ -472,14 +444,12 @@ export function CustomSelect<OptionInterfaceT extends CustomSelectOptionInterfac
 
   const focusOption = React.useCallback(
     (type: 'next' | 'prev') => {
-      let index = focusedOptionIndex;
+      let index = focusedOptionIndex ?? -1;
 
       if (type === 'next') {
-        const nextIndex = findIndexAfter(options, index);
-        index = nextIndex === -1 ? findIndexAfter(options) : nextIndex; // Следующий за index или первый валидный до index
+        index = index >= options.length - 1 ? 0 : ++index;
       } else if (type === 'prev') {
-        const beforeIndex = findIndexBefore(options, index);
-        index = beforeIndex === -1 ? findIndexBefore(options) : beforeIndex; // Предшествующий index или последний валидный после index
+        index = index <= 0 ? options.length - 1 : --index;
       }
 
       focusOptionByIndex(index);
diff --git a/packages/vkui/src/components/CustomSelectOption/CustomSelectOption.tsx b/packages/vkui/src/components/CustomSelectOption/CustomSelectOption.tsx
index ffe3d5533a..e6bc116671 100644
--- a/packages/vkui/src/components/CustomSelectOption/CustomSelectOption.tsx
+++ b/packages/vkui/src/components/CustomSelectOption/CustomSelectOption.tsx
@@ -60,7 +60,7 @@ export interface CustomSelectOptionProps extends HTMLAttributesWithRootRef<HTMLD
 export const CustomSelectOption = ({
   children,
   hierarchy = 0,
-  hovered: hoveredProp,
+  hovered,
   selected,
   before,
   after,
@@ -82,7 +82,6 @@ export const CustomSelectOption = ({
         : styleProp,
     [hierarchy, styleProp],
   );
-  const hovered = hoveredProp && !disabled ? true : false;
 
   return (
     <Paragraph