diff --git a/.yarn/offline-mirror/focus-trap-5.1.0.tgz b/.yarn/offline-mirror/focus-trap-5.1.0.tgz
deleted file mode 100644
index cab82cf3f..000000000
Binary files a/.yarn/offline-mirror/focus-trap-5.1.0.tgz and /dev/null differ
diff --git a/.yarn/offline-mirror/focus-trap-6.5.0.tgz b/.yarn/offline-mirror/focus-trap-6.5.0.tgz
new file mode 100644
index 000000000..3cf2aa620
Binary files /dev/null and b/.yarn/offline-mirror/focus-trap-6.5.0.tgz differ
diff --git a/.yarn/offline-mirror/focus-trap-react-7.0.1.tgz b/.yarn/offline-mirror/focus-trap-react-7.0.1.tgz
deleted file mode 100644
index ed739d4f5..000000000
Binary files a/.yarn/offline-mirror/focus-trap-react-7.0.1.tgz and /dev/null differ
diff --git a/.yarn/offline-mirror/focus-trap-react-8.5.1.tgz b/.yarn/offline-mirror/focus-trap-react-8.5.1.tgz
new file mode 100644
index 000000000..ecb14293c
Binary files /dev/null and b/.yarn/offline-mirror/focus-trap-react-8.5.1.tgz differ
diff --git a/.yarn/offline-mirror/tabbable-4.0.0.tgz b/.yarn/offline-mirror/tabbable-4.0.0.tgz
deleted file mode 100644
index a8ced64a4..000000000
Binary files a/.yarn/offline-mirror/tabbable-4.0.0.tgz and /dev/null differ
diff --git a/.yarn/offline-mirror/tabbable-5.2.0.tgz b/.yarn/offline-mirror/tabbable-5.2.0.tgz
new file mode 100644
index 000000000..21423c17d
Binary files /dev/null and b/.yarn/offline-mirror/tabbable-5.2.0.tgz differ
diff --git a/package.json b/package.json
index 205ba07f2..28609b8fb 100644
--- a/package.json
+++ b/package.json
@@ -68,7 +68,7 @@
     "downshift": "^1.31.14",
     "export-to-csv": "^0.2.1",
     "flatpickr": "^4.6.1",
-    "focus-trap-react": "^7.0.1",
+    "focus-trap-react": "^8.5.1",
     "invariant": "^2.2.3",
     "numeral": "^2.0.6",
     "prop-types": "^15.7.2",
diff --git a/src/components/__tests__/__snapshots__/publicAPI.spec.js.snap b/src/components/__tests__/__snapshots__/publicAPI.spec.js.snap
index dca2d17b0..7e8745ea8 100644
--- a/src/components/__tests__/__snapshots__/publicAPI.spec.js.snap
+++ b/src/components/__tests__/__snapshots__/publicAPI.spec.js.snap
@@ -1503,10 +1503,30 @@ Map {
         "args": Array [
           Object {
             "allowOutsideClick": Object {
-              "type": "func",
+              "args": Array [
+                Array [
+                  Object {
+                    "type": "bool",
+                  },
+                  Object {
+                    "type": "func",
+                  },
+                ],
+              ],
+              "type": "oneOfType",
             },
             "clickOutsideDeactivates": Object {
-              "type": "bool",
+              "args": Array [
+                Array [
+                  Object {
+                    "type": "bool",
+                  },
+                  Object {
+                    "type": "func",
+                  },
+                ],
+              ],
+              "type": "oneOfType",
             },
             "escapeDeactivates": Object {
               "type": "bool",
@@ -7328,10 +7348,30 @@ Map {
         "args": Array [
           Object {
             "allowOutsideClick": Object {
-              "type": "func",
+              "args": Array [
+                Array [
+                  Object {
+                    "type": "bool",
+                  },
+                  Object {
+                    "type": "func",
+                  },
+                ],
+              ],
+              "type": "oneOfType",
             },
             "clickOutsideDeactivates": Object {
-              "type": "bool",
+              "args": Array [
+                Array [
+                  Object {
+                    "type": "bool",
+                  },
+                  Object {
+                    "type": "func",
+                  },
+                ],
+              ],
+              "type": "oneOfType",
             },
             "escapeDeactivates": Object {
               "type": "bool",
@@ -7573,10 +7613,30 @@ Map {
         "args": Array [
           Object {
             "allowOutsideClick": Object {
-              "type": "func",
+              "args": Array [
+                Array [
+                  Object {
+                    "type": "bool",
+                  },
+                  Object {
+                    "type": "func",
+                  },
+                ],
+              ],
+              "type": "oneOfType",
             },
             "clickOutsideDeactivates": Object {
-              "type": "bool",
+              "args": Array [
+                Array [
+                  Object {
+                    "type": "bool",
+                  },
+                  Object {
+                    "type": "func",
+                  },
+                ],
+              ],
+              "type": "oneOfType",
             },
             "escapeDeactivates": Object {
               "type": "bool",
diff --git a/yarn.lock b/yarn.lock
index a7a0a00d1..c6b2bc38f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9976,20 +9976,19 @@ focus-lock@^0.7.0:
   resolved "https://registry.yarnpkg.com/focus-lock/-/focus-lock-0.7.0.tgz#b2bfb0ca7beacc8710a1ff74275fe0dc60a1d88a"
   integrity sha512-LI7v2mH02R55SekHYdv9pRHR9RajVNyIJ2N5IEkWbg7FT5ZmJ9Hw4mWxHeEUcd+dJo0QmzztHvDvWcc7prVFsw==
 
-focus-trap-react@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/focus-trap-react/-/focus-trap-react-7.0.1.tgz#42b4e548f27afa4c765a47894888eeed9aac8129"
-  integrity sha512-12TxHtVntj/sCsT3bwB3pPK+3rACMFLO7LBfk4nKrw1HERRmO/oc0+woD9vZKffxo5zkxkz9amc9rou9reVnpA==
+focus-trap-react@^8.5.1:
+  version "8.5.1"
+  resolved "https://registry.yarnpkg.com/focus-trap-react/-/focus-trap-react-8.5.1.tgz#722c8cfe64001f30d9c9cc5a1c62febb72befee1"
+  integrity sha512-tJHFonnhw34/tQ/lFE4Zlbdf/2vTlgIhK2jRytC6hWTmw5ndxKSot/8zWEXKzf7B+6A87e7kDLWZjdUkbVue6g==
   dependencies:
-    focus-trap "^5.1.0"
+    focus-trap "^6.5.0"
 
-focus-trap@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/focus-trap/-/focus-trap-5.1.0.tgz#64a0bfabd95c382103397dbc96bfef3a3cf8e5ad"
-  integrity sha512-CkB/nrO55069QAUjWFBpX6oc+9V90Qhgpe6fBWApzruMq5gnlh90Oo7iSSDK7pKiV5ugG6OY2AXM5mxcmL3lwQ==
+focus-trap@^6.5.0:
+  version "6.5.0"
+  resolved "https://registry.yarnpkg.com/focus-trap/-/focus-trap-6.5.0.tgz#d99fdf5f3da07c08e7f5b9cad33746db2b215f97"
+  integrity sha512-mezVantxaWNMrcJcrdw/bDfW3rVkl0xcdHKiHbNZzJ2R+KfcW9S6j48wFUAu7C52GFeQDGEWgDEIAvk9PxFvZw==
   dependencies:
-    tabbable "^4.0.0"
-    xtend "^4.0.1"
+    tabbable "^5.2.0"
 
 follow-redirects@1.5.10:
   version "1.5.10"
@@ -19805,10 +19804,10 @@ symbol.prototype.description@^1.0.0:
     es-abstract "^1.16.0"
     has-symbols "^1.0.0"
 
-tabbable@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/tabbable/-/tabbable-4.0.0.tgz#5bff1d1135df1482cf0f0206434f15eadbeb9261"
-  integrity sha512-H1XoH1URcBOa/rZZWxLxHCtOdVUEev+9vo5YdYhC9tCY4wnybX+VQrCYuy9ubkg69fCBxCONJOSLGfw0DWMffQ==
+tabbable@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/tabbable/-/tabbable-5.2.0.tgz#4fba60991d8bb89d06e5d9455c92b453acf88fb2"
+  integrity sha512-0uyt8wbP0P3T4rrsfYg/5Rg3cIJ8Shl1RJ54QMqYxm1TLdWqJD1u6+RQjr2Lor3wmfT7JRHkirIwy99ydBsyPg==
 
 table@4.0.2:
   version "4.0.2"