diff --git a/libs/mobile/shared/ui/ui-kit/src/action-buttons-modal/component.tsx b/libs/mobile/shared/ui/ui-kit/src/action-buttons-modal/component.tsx
index b54c655..9b07d9f 100644
--- a/libs/mobile/shared/ui/ui-kit/src/action-buttons-modal/component.tsx
+++ b/libs/mobile/shared/ui/ui-kit/src/action-buttons-modal/component.tsx
@@ -6,7 +6,7 @@ import { ToastService } from '@open-webui-react-native/shared/utils/toast-servic
 import { AppBottomSheet } from '../bottom-sheet';
 import { AppButton } from '../button';
 import { AppText } from '../text';
-import { AppBottomSheetTextInput, AppBottomSheetTextInputRef } from '../text-input';
+import { BottomSheetTextInput, BottomSheetTextInputRef } from '../text-input';
 import { View } from '../view';
 
 export type ActionButtonsModalMethods = {
@@ -37,7 +37,7 @@ export function ActionButtonsModal({
 }: ActionButtonsModalProps): ReactElement {
   const translate = useTranslation('SHARED.ACTION_BUTTONS_MODAL');
   const modalRef = useRef<BottomSheetModal>(null);
-  const inputRef = useRef<AppBottomSheetTextInputRef>(null);
+  const inputRef = useRef<BottomSheetTextInputRef>(null);
 
   const [value, setValue] = useState('');
 
@@ -82,7 +82,7 @@ export function ActionButtonsModal({
             ) : (
               description
             ))}
-          {withInput && <AppBottomSheetTextInput
+          {withInput && <BottomSheetTextInput
             ref={inputRef}
             value={value}
             onChangeText={setValue} />}
diff --git a/libs/mobile/shared/ui/ui-kit/src/bottom-sheet-text-input/component.tsx b/libs/mobile/shared/ui/ui-kit/src/bottom-sheet-text-input/component.tsx
deleted file mode 100644
index 8842c82..0000000
--- a/libs/mobile/shared/ui/ui-kit/src/bottom-sheet-text-input/component.tsx
+++ /dev/null
@@ -1,30 +0,0 @@
-import { delay } from 'lodash-es';
-import { ReactElement } from 'react';
-import { TextInputProps } from 'react-native';
-import { uiState$ } from '@open-webui-react-native/mobile/shared/ui/ui-state';
-import { AppTextInput, AppInputProps } from '../text-input';
-
-export type AppBottomSheetTextInputProps = AppInputProps;
-
-export const AppBottomSheetTextInput = ({
-  onFocus,
-  onBlur,
-  ref,
-  ...props
-}: AppBottomSheetTextInputProps): ReactElement => {
-  const handleFocus: TextInputProps['onFocus'] = (e): void => {
-    uiState$.isBottomSheetInputFocused.set(true);
-    onFocus?.(e);
-  };
-
-  const handleBlur: TextInputProps['onBlur'] = (e): void => {
-    onBlur?.(e);
-    delay(() => uiState$.isBottomSheetInputFocused.set(false), 500);
-  };
-
-  return <AppTextInput
-    ref={ref}
-    onFocus={handleFocus}
-    onBlur={handleBlur}
-    {...props} />;
-};
diff --git a/libs/mobile/shared/ui/ui-kit/src/bottom-sheet-text-input/index.ts b/libs/mobile/shared/ui/ui-kit/src/bottom-sheet-text-input/index.ts
deleted file mode 100644
index bb82484..0000000
--- a/libs/mobile/shared/ui/ui-kit/src/bottom-sheet-text-input/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './component';
diff --git a/libs/mobile/shared/ui/ui-kit/src/index.ts b/libs/mobile/shared/ui/ui-kit/src/index.ts
index 79bf826..5087e2e 100644
--- a/libs/mobile/shared/ui/ui-kit/src/index.ts
+++ b/libs/mobile/shared/ui/ui-kit/src/index.ts
@@ -31,7 +31,6 @@ export * from './zoom';
 export * from './toast';
 export * from './math-svg';
 export * from './pressable';
-export * from './bottom-sheet-text-input';
 export * from './floated-label-input';
 export * from './form-floated-label-input';
 export * from './search-input';
diff --git a/libs/mobile/shared/ui/ui-kit/src/search-input/component.tsx b/libs/mobile/shared/ui/ui-kit/src/search-input/component.tsx
index 3b18650..af96ea6 100644
--- a/libs/mobile/shared/ui/ui-kit/src/search-input/component.tsx
+++ b/libs/mobile/shared/ui/ui-kit/src/search-input/component.tsx
@@ -2,11 +2,10 @@ import { useTranslation } from '@ronas-it/react-native-common-modules/i18n';
 import { ReactElement } from 'react';
 import { Platform } from 'react-native';
 import { cn } from '@open-webui-react-native/mobile/shared/ui/styles';
-import { AppBottomSheetTextInput } from '../bottom-sheet-text-input';
 import { Icon } from '../icon';
 import { GestureAppPressable, AppPressable } from '../pressable';
 import { AppText } from '../text';
-import { AppTextInput, AppInputProps } from '../text-input';
+import { BottomSheetTextInput, AppTextInput, AppInputProps } from '../text-input';
 import { View } from '../view';
 
 interface SearchInputProps extends AppInputProps {
@@ -25,7 +24,7 @@ export function SearchInput({
 }: SearchInputProps): ReactElement {
   const translate = useTranslation('SHARED.SEARCH_INPUT');
 
-  const InputComponent = isInBottomSheet ? AppBottomSheetTextInput : AppTextInput;
+  const InputComponent = isInBottomSheet ? BottomSheetTextInput : AppTextInput;
 
   //NOTE: AppPressable does not work correctly in modal on IOS, but GestureAppPressable does not work correctly in modal on Android
   const PressableComponent = Platform.OS === 'ios' ? GestureAppPressable : AppPressable;
diff --git a/libs/mobile/shared/ui/ui-kit/src/text-input/component.tsx b/libs/mobile/shared/ui/ui-kit/src/text-input/component.tsx
index de0132b..02ea757 100644
--- a/libs/mobile/shared/ui/ui-kit/src/text-input/component.tsx
+++ b/libs/mobile/shared/ui/ui-kit/src/text-input/component.tsx
@@ -1,4 +1,4 @@
-import { BottomSheetTextInput } from '@gorhom/bottom-sheet';
+import { BottomSheetTextInput as BottomSheetTextInputComponent } from '@gorhom/bottom-sheet';
 import { ComponentRef, ReactElement, Ref } from 'react';
 import { Platform, TextInput, TextInputProps, View } from 'react-native';
 import { cn, colors } from '@open-webui-react-native/mobile/shared/ui/styles';
@@ -55,13 +55,13 @@ export const AppTextInput = ({
   );
 };
 
-export type AppBottomSheetTextInputRef = ComponentRef<typeof BottomSheetTextInput>;
+export type BottomSheetTextInputRef = ComponentRef<typeof BottomSheetTextInputComponent>;
 
-export type AppBottomSheetInputProps = Omit<AppInputProps, 'ref'> & {
-  ref?: Ref<AppBottomSheetTextInputRef>;
+export type BottomSheetTextInputProps = Omit<AppInputProps, 'ref'> & {
+  ref?: Ref<BottomSheetTextInputRef>;
 };
 
-export const AppBottomSheetTextInput = ({
+export const BottomSheetTextInput = ({
   onFocus,
   onBlur,
   label,
@@ -74,7 +74,7 @@ export const AppBottomSheetTextInput = ({
   hitSlop,
   ref,
   ...inputProps
-}: AppBottomSheetInputProps): ReactElement => {
+}: BottomSheetTextInputProps): ReactElement => {
   const isIos = Platform.OS === 'ios';
 
   return (
@@ -82,7 +82,7 @@ export const AppBottomSheetTextInput = ({
       {accessoryTop}
       <View className={`flex-row gap-12 items-center max-h-[${maxHeight}]`}>
         {accessoryLeft}
-        <BottomSheetTextInput
+        <BottomSheetTextInputComponent
           ref={ref}
           className={cn(baseClasses.textClasses, isIos && '!leading-[0]', textClassName)}
           placeholderTextColor={colors.textSecondary}