diff --git a/src/components/providers/DrawerProvider.tsx b/src/components/providers/DrawerProvider.tsx
index fac43ef45..8ce847f36 100644
--- a/src/components/providers/DrawerProvider.tsx
+++ b/src/components/providers/DrawerProvider.tsx
@@ -183,11 +183,11 @@ function DrawerProvider({ children }: DrawerProviderProps) {
         )}
         <Drawer
           classes={{ root: classes.appRightDrawer, paper: clsx(classes.paper, isMaximized && MAXIMIZE_CLASS) }}
-          disableEnforceFocus
           open={globalDrawerOpened}
           anchor="right"
           variant={isXL ? 'persistent' : 'temporary'}
           style={{ width: globalDrawer ? drawerWidth : 0 }}
+          ModalProps={{ disableEnforceFocus: true }}
           onClose={closeGlobalDrawer}
         >
           {useMemo(