diff --git a/src/components/FocusTrap/FocusTrapForModal/index.web.tsx b/src/components/FocusTrap/FocusTrapForModal/index.web.tsx
index 1ea425f0f9fd..be5da8c49a78 100644
--- a/src/components/FocusTrap/FocusTrapForModal/index.web.tsx
+++ b/src/components/FocusTrap/FocusTrapForModal/index.web.tsx
@@ -9,7 +9,7 @@ function FocusTrapForModal({children, active}: FocusTrapForModalProps) {
             active={active}
             focusTrapOptions={{
                 trapStack: sharedTrapStack,
-                allowOutsideClick: true,
+                clickOutsideDeactivates: true,
                 initialFocus: false,
                 fallbackFocus: document.body,
             }}
diff --git a/src/components/FocusTrap/WIDE_LAYOUT_INACTIVE_SCREENS.ts b/src/components/FocusTrap/WIDE_LAYOUT_INACTIVE_SCREENS.ts
index dd1a65cdb75a..be772c6ae10c 100644
--- a/src/components/FocusTrap/WIDE_LAYOUT_INACTIVE_SCREENS.ts
+++ b/src/components/FocusTrap/WIDE_LAYOUT_INACTIVE_SCREENS.ts
@@ -33,6 +33,8 @@ const WIDE_LAYOUT_INACTIVE_SCREENS: string[] = [
     SCREENS.WORKSPACE.REPORT_FIELDS,
     SCREENS.WORKSPACE.DISTANCE_RATES,
     SCREENS.SEARCH.CENTRAL_PANE,
+    SCREENS.SETTINGS.TROUBLESHOOT,
+    SCREENS.SETTINGS.SAVE_THE_WORLD,
 ];
 
 export default WIDE_LAYOUT_INACTIVE_SCREENS;