diff --git a/src/DocSearch.tsx b/src/DocSearch.tsx
index ebecb1df..5df7c2ca 100644
--- a/src/DocSearch.tsx
+++ b/src/DocSearch.tsx
@@ -16,6 +16,7 @@ import { groupBy, noop } from './utils';
 import { createStoredSearches } from './stored-searches';
 import { useSearchClient } from './useSearchClient';
 import { useTrapFocus } from './useTrapFocus';
+import { useTouchEvents } from './useTouchEvents';
 import { Hit } from './Hit';
 import { SearchBox } from './SearchBox';
 import { ScreenState } from './ScreenState';
@@ -66,7 +67,6 @@ export function DocSearch({
       : ''
   ).current;
 
-  useTrapFocus({ container: containerRef.current });
   const searchClient = useSearchClient(appId, apiKey);
   const favoriteSearches = React.useRef(
     createStoredSearches<StoredDocSearchHit>({
@@ -274,6 +274,14 @@ export function DocSearch({
 
   const { getEnvironmentProps, getRootProps, refresh } = autocomplete;
 
+  useTouchEvents({
+    getEnvironmentProps,
+    dropdownElement: dropdownRef.current,
+    searchBoxElement: searchBoxRef.current,
+    inputElement: inputRef.current,
+  });
+  useTrapFocus({ container: containerRef.current });
+
   React.useEffect(() => {
     const isMobileMediaQuery = window.matchMedia('(max-width: 750px)');
 
@@ -299,26 +307,6 @@ export function DocSearch({
     }
   }, [initialQuery, refresh]);
 
-  React.useEffect(() => {
-    if (!(searchBoxRef.current && dropdownRef.current && inputRef.current)) {
-      return undefined;
-    }
-
-    const { onTouchStart, onTouchMove } = getEnvironmentProps({
-      searchBoxElement: searchBoxRef.current,
-      dropdownElement: dropdownRef.current,
-      inputElement: inputRef.current,
-    });
-
-    window.addEventListener('touchstart', onTouchStart);
-    window.addEventListener('touchmove', onTouchMove);
-
-    return () => {
-      window.removeEventListener('touchstart', onTouchStart);
-      window.removeEventListener('touchmove', onTouchMove);
-    };
-  }, [getEnvironmentProps, searchBoxRef, dropdownRef, inputRef]);
-
   return (
     <div
       ref={containerRef}
diff --git a/src/useTouchEvents.ts b/src/useTouchEvents.ts
new file mode 100644
index 00000000..523f1d04
--- /dev/null
+++ b/src/useTouchEvents.ts
@@ -0,0 +1,36 @@
+import React from 'react';
+import { AutocompleteApi } from '@francoischalifour/autocomplete-core';
+
+interface UseTouchEventsProps {
+  getEnvironmentProps: AutocompleteApi<any>['getEnvironmentProps'];
+  dropdownElement: HTMLDivElement | null;
+  searchBoxElement: HTMLDivElement | null;
+  inputElement: HTMLInputElement | null;
+}
+
+export function useTouchEvents({
+  getEnvironmentProps,
+  dropdownElement,
+  searchBoxElement,
+  inputElement,
+}: UseTouchEventsProps) {
+  React.useEffect(() => {
+    if (!(dropdownElement && searchBoxElement && inputElement)) {
+      return undefined;
+    }
+
+    const { onTouchStart, onTouchMove } = getEnvironmentProps({
+      dropdownElement,
+      searchBoxElement,
+      inputElement,
+    });
+
+    window.addEventListener('touchstart', onTouchStart);
+    window.addEventListener('touchmove', onTouchMove);
+
+    return () => {
+      window.removeEventListener('touchstart', onTouchStart);
+      window.removeEventListener('touchmove', onTouchMove);
+    };
+  }, [getEnvironmentProps, dropdownElement, searchBoxElement, inputElement]);
+}