diff --git a/src/components/AutoCompleteSuggestions/BaseAutoCompleteSuggestions.tsx b/src/components/AutoCompleteSuggestions/BaseAutoCompleteSuggestions.tsx
index abc221ed646a..27850b743c70 100644
--- a/src/components/AutoCompleteSuggestions/BaseAutoCompleteSuggestions.tsx
+++ b/src/components/AutoCompleteSuggestions/BaseAutoCompleteSuggestions.tsx
@@ -6,7 +6,7 @@ import ColorSchemeWrapper from '@components/ColorSchemeWrapper';
 import PressableWithFeedback from '@components/Pressable/PressableWithFeedback';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useThemeStyles from '@hooks/useThemeStyles';
-import * as DeviceCapabilities from '@libs/DeviceCapabilities';
+import {hasHoverSupport} from '@libs/DeviceCapabilities';
 import CONST from '@src/CONST';
 import type {AutoCompleteSuggestionsPortalProps} from './AutoCompleteSuggestionsPortal';
 import type {RenderSuggestionMenuItemProps} from './types';
@@ -92,7 +92,7 @@ function BaseAutoCompleteSuggestions<TSuggestion>({
         <Animated.View
             style={[styles.autoCompleteSuggestionsContainer, animatedStyles]}
             onPointerDown={(e) => {
-                if (DeviceCapabilities.hasHoverSupport()) {
+                if (hasHoverSupport()) {
                     return;
                 }
                 e.preventDefault();
@@ -108,6 +108,7 @@ function BaseAutoCompleteSuggestions<TSuggestion>({
                     removeClippedSubviews={false}
                     showsVerticalScrollIndicator={innerHeight > rowHeight.get()}
                     extraData={[highlightedSuggestionIndex, renderSuggestionMenuItem]}
+                    style={styles.overscrollBehaviorContain}
                 />
             </ColorSchemeWrapper>
         </Animated.View>