diff --git a/src/webpack/common/components.ts b/src/webpack/common/components.ts
index 7cda74590..449106f87 100644
--- a/src/webpack/common/components.ts
+++ b/src/webpack/common/components.ts
@@ -107,7 +107,7 @@ export const ScrollerAuto = LazyComponent(() => createScroller?.(scrollerClasses
 export const ListScrollerThin = LazyComponent(() => createListScroller(listScrollerClasses.thin, listScrollerClasses.fade, "", ResizeObserver));
 export const ListScrollerAuto = LazyComponent(() => createListScroller(listScrollerClasses.auto, listScrollerClasses.fade, "", ResizeObserver));
 
-export const FocusLock = waitForComponent<t.FocusLock>("FocusLock", filters.componentByCode(".containerRef,{keyboardModeEnabled:"));
+export const FocusLock = waitForComponent<t.FocusLock>("FocusLock", filters.componentByCode(".containerRef,{disableReturn:"));
 
 export let useToken: t.useToken;
 waitFor(m => {