diff --git a/app/containers/ActionSheet/ActionSheet.tsx b/app/containers/ActionSheet/ActionSheet.tsx
index 7ee96e0c3..3a715bdea 100644
--- a/app/containers/ActionSheet/ActionSheet.tsx
+++ b/app/containers/ActionSheet/ActionSheet.tsx
@@ -140,8 +140,7 @@ const ActionSheet = React.memo(
 						style={{ ...styles.container, ...bottomSheet }}
 						backgroundStyle={{ backgroundColor: colors.focusedBackground }}
 						onChange={index => index === -1 && onClose()}
-						activeOffsetY={[-5, 5]}
-						failOffsetX={[-5, 5]}
+						enableContentPanningGesture={false}
 						{...androidTablet}
 					>
 						<BottomSheetContent options={data?.options} hide={hide} children={data?.children} hasCancel={data?.hasCancel} />
diff --git a/app/containers/EmojiPicker/EmojiCategory.tsx b/app/containers/EmojiPicker/EmojiCategory.tsx
index 33d8078f9..19800744d 100644
--- a/app/containers/EmojiPicker/EmojiCategory.tsx
+++ b/app/containers/EmojiPicker/EmojiCategory.tsx
@@ -1,7 +1,6 @@
 import React from 'react';
 import { Text, Pressable } from 'react-native';
-import { BottomSheetFlatList } from '@gorhom/bottom-sheet';
-import { FlatList as GHFlatList } from 'react-native-gesture-handler';
+import { FlatList } from 'react-native-gesture-handler';
 
 import shortnameToUnicode from '../../lib/methods/helpers/shortnameToUnicode';
 import styles from './styles';
@@ -36,18 +35,10 @@ const Emoji = React.memo(({ emoji, size, baseUrl }: IEmojiProps) => {
 	);
 });
 
-const EmojiCategory = ({
-	baseUrl,
-	onEmojiSelected,
-	emojis,
-	width,
-	tabsCount,
-	isBottomSheet
-}: IEmojiCategory): React.ReactElement | null => {
+const EmojiCategory = ({ baseUrl, onEmojiSelected, emojis, width, tabsCount }: IEmojiCategory): React.ReactElement | null => {
 	const emojiSize = width ? Math.min(width / tabsCount, MAX_EMOJI_SIZE) : MAX_EMOJI_SIZE;
 	const numColumns = Math.trunc(width ? width / emojiSize : tabsCount);
 	const { colors } = useTheme();
-	const FlatList = isBottomSheet ? BottomSheetFlatList : GHFlatList;
 
 	const renderItem = (emoji: IEmoji) => (
 		<Pressable
diff --git a/app/containers/EmojiPicker/index.tsx b/app/containers/EmojiPicker/index.tsx
index 92aa2d48c..a8325e58c 100644
--- a/app/containers/EmojiPicker/index.tsx
+++ b/app/containers/EmojiPicker/index.tsx
@@ -137,7 +137,6 @@ const EmojiPicker = ({
 				baseUrl={baseUrl}
 				tabLabel={label}
 				tabsCount={tabsCount}
-				isBottomSheet={!isEmojiKeyboard}
 			/>
 		);
 	};
@@ -159,7 +158,6 @@ const EmojiPicker = ({
 					baseUrl={baseUrl}
 					tabLabel={'searching'}
 					tabsCount={tabsCount}
-					isBottomSheet={!isEmojiKeyboard}
 				/>
 			) : (
 				<ScrollableTabView
diff --git a/app/definitions/IEmoji.ts b/app/definitions/IEmoji.ts
index 463bdac6f..0dcf298bf 100644
--- a/app/definitions/IEmoji.ts
+++ b/app/definitions/IEmoji.ts
@@ -36,7 +36,6 @@ export interface IEmojiCategory {
 	style: StyleProp<ImageStyle>;
 	tabLabel: string;
 	tabsCount: number;
-	isBottomSheet: boolean;
 }
 
 export type TGetCustomEmoji = (name: string) => any;