diff --git a/packages/terra-dropdown-button/CHANGELOG.md b/packages/terra-dropdown-button/CHANGELOG.md
index 39abe6dc788..80e180ce9f4 100644
--- a/packages/terra-dropdown-button/CHANGELOG.md
+++ b/packages/terra-dropdown-button/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## Unreleased
 
 * Changed
+  * Upgrade focus-trap-react to version ^8.0.0.
   * Migrate doc to terra-core-docs.
 
 ## 1.29.0 - (September 21, 2021)
diff --git a/packages/terra-dropdown-button/package.json b/packages/terra-dropdown-button/package.json
index 5fe65a362b2..33b7c29152c 100644
--- a/packages/terra-dropdown-button/package.json
+++ b/packages/terra-dropdown-button/package.json
@@ -28,7 +28,7 @@
   },
   "dependencies": {
     "classnames": "^2.2.5",
-    "focus-trap-react": "^6.0.0",
+    "focus-trap-react": "^8.0.0",
     "keycode-js": "^3.1.0",
     "prop-types": "^15.5.8",
     "terra-hookshot": "^5.0.0",
diff --git a/packages/terra-dropdown-button/src/_Dropdown.jsx b/packages/terra-dropdown-button/src/_Dropdown.jsx
index d8f6461bb08..e8e62d88d5a 100644
--- a/packages/terra-dropdown-button/src/_Dropdown.jsx
+++ b/packages/terra-dropdown-button/src/_Dropdown.jsx
@@ -55,7 +55,7 @@ const Dropdown = ({
       onEsc={requestClose}
       onOutsideClick={requestClose}
     >
-      <FocusTrap focusTrapOptions={{ returnFocusOnDeactivate: true, initialFocus: openedViaKeyboard ? '' : buttonRef, clickOutsideDeactivates: true }}>
+      <FocusTrap focusTrapOptions={openedViaKeyboard ? { returnFocusOnDeactivate: true, clickOutsideDeactivates: true } : { returnFocusOnDeactivate: true, initialFocus: buttonRef, clickOutsideDeactivates: true }}>
         <DropdownList
           requestClose={requestClose}
           width={width}
diff --git a/packages/terra-dropdown-button/tests/wdio/__snapshots__/reference/clinical-lowlight-theme/en/chrome_medium/dropdown-button-spec/clicking_outside_closes_dropdown.png b/packages/terra-dropdown-button/tests/wdio/__snapshots__/reference/clinical-lowlight-theme/en/chrome_medium/dropdown-button-spec/clicking_outside_closes_dropdown.png
index df6a2919d95..2bf31dd9d98 100644
Binary files a/packages/terra-dropdown-button/tests/wdio/__snapshots__/reference/clinical-lowlight-theme/en/chrome_medium/dropdown-button-spec/clicking_outside_closes_dropdown.png and b/packages/terra-dropdown-button/tests/wdio/__snapshots__/reference/clinical-lowlight-theme/en/chrome_medium/dropdown-button-spec/clicking_outside_closes_dropdown.png differ
diff --git a/packages/terra-dropdown-button/tests/wdio/__snapshots__/reference/clinical-lowlight-theme/en/chrome_medium/dropdown-button-spec/tab.png b/packages/terra-dropdown-button/tests/wdio/__snapshots__/reference/clinical-lowlight-theme/en/chrome_medium/dropdown-button-spec/tab.png
index 2bf31dd9d98..df6a2919d95 100644
Binary files a/packages/terra-dropdown-button/tests/wdio/__snapshots__/reference/clinical-lowlight-theme/en/chrome_medium/dropdown-button-spec/tab.png and b/packages/terra-dropdown-button/tests/wdio/__snapshots__/reference/clinical-lowlight-theme/en/chrome_medium/dropdown-button-spec/tab.png differ
diff --git a/packages/terra-dropdown-button/tests/wdio/__snapshots__/reference/clinical-lowlight-theme/en/chrome_medium/split-button-spec/clicking_outside_closes_dropdown.png b/packages/terra-dropdown-button/tests/wdio/__snapshots__/reference/clinical-lowlight-theme/en/chrome_medium/split-button-spec/clicking_outside_closes_dropdown.png
index 9fa6952a573..8f74d9e0f1d 100644
Binary files a/packages/terra-dropdown-button/tests/wdio/__snapshots__/reference/clinical-lowlight-theme/en/chrome_medium/split-button-spec/clicking_outside_closes_dropdown.png and b/packages/terra-dropdown-button/tests/wdio/__snapshots__/reference/clinical-lowlight-theme/en/chrome_medium/split-button-spec/clicking_outside_closes_dropdown.png differ
diff --git a/packages/terra-dropdown-button/tests/wdio/__snapshots__/reference/clinical-lowlight-theme/en/chrome_medium/split-button-spec/tab.png b/packages/terra-dropdown-button/tests/wdio/__snapshots__/reference/clinical-lowlight-theme/en/chrome_medium/split-button-spec/tab.png
index 8f74d9e0f1d..9fa6952a573 100644
Binary files a/packages/terra-dropdown-button/tests/wdio/__snapshots__/reference/clinical-lowlight-theme/en/chrome_medium/split-button-spec/tab.png and b/packages/terra-dropdown-button/tests/wdio/__snapshots__/reference/clinical-lowlight-theme/en/chrome_medium/split-button-spec/tab.png differ
diff --git a/packages/terra-dropdown-button/tests/wdio/__snapshots__/reference/orion-fusion-theme/en/chrome_medium/dropdown-button-spec/clicking_outside_closes_dropdown.png b/packages/terra-dropdown-button/tests/wdio/__snapshots__/reference/orion-fusion-theme/en/chrome_medium/dropdown-button-spec/clicking_outside_closes_dropdown.png
index 12805825cf5..0ed0c3cdc7c 100644
Binary files a/packages/terra-dropdown-button/tests/wdio/__snapshots__/reference/orion-fusion-theme/en/chrome_medium/dropdown-button-spec/clicking_outside_closes_dropdown.png and b/packages/terra-dropdown-button/tests/wdio/__snapshots__/reference/orion-fusion-theme/en/chrome_medium/dropdown-button-spec/clicking_outside_closes_dropdown.png differ
diff --git a/packages/terra-dropdown-button/tests/wdio/__snapshots__/reference/orion-fusion-theme/en/chrome_medium/dropdown-button-spec/tab.png b/packages/terra-dropdown-button/tests/wdio/__snapshots__/reference/orion-fusion-theme/en/chrome_medium/dropdown-button-spec/tab.png
index 0ed0c3cdc7c..12805825cf5 100644
Binary files a/packages/terra-dropdown-button/tests/wdio/__snapshots__/reference/orion-fusion-theme/en/chrome_medium/dropdown-button-spec/tab.png and b/packages/terra-dropdown-button/tests/wdio/__snapshots__/reference/orion-fusion-theme/en/chrome_medium/dropdown-button-spec/tab.png differ
diff --git a/packages/terra-dropdown-button/tests/wdio/__snapshots__/reference/orion-fusion-theme/en/chrome_medium/split-button-spec/clicking_outside_closes_dropdown.png b/packages/terra-dropdown-button/tests/wdio/__snapshots__/reference/orion-fusion-theme/en/chrome_medium/split-button-spec/clicking_outside_closes_dropdown.png
index 877bd3b449b..e78054ee19a 100644
Binary files a/packages/terra-dropdown-button/tests/wdio/__snapshots__/reference/orion-fusion-theme/en/chrome_medium/split-button-spec/clicking_outside_closes_dropdown.png and b/packages/terra-dropdown-button/tests/wdio/__snapshots__/reference/orion-fusion-theme/en/chrome_medium/split-button-spec/clicking_outside_closes_dropdown.png differ
diff --git a/packages/terra-dropdown-button/tests/wdio/__snapshots__/reference/orion-fusion-theme/en/chrome_medium/split-button-spec/tab.png b/packages/terra-dropdown-button/tests/wdio/__snapshots__/reference/orion-fusion-theme/en/chrome_medium/split-button-spec/tab.png
index e78054ee19a..877bd3b449b 100644
Binary files a/packages/terra-dropdown-button/tests/wdio/__snapshots__/reference/orion-fusion-theme/en/chrome_medium/split-button-spec/tab.png and b/packages/terra-dropdown-button/tests/wdio/__snapshots__/reference/orion-fusion-theme/en/chrome_medium/split-button-spec/tab.png differ
diff --git a/packages/terra-dropdown-button/tests/wdio/__snapshots__/reference/terra-default-theme/en/chrome_medium/dropdown-button-spec/clicking_outside_closes_dropdown.png b/packages/terra-dropdown-button/tests/wdio/__snapshots__/reference/terra-default-theme/en/chrome_medium/dropdown-button-spec/clicking_outside_closes_dropdown.png
index 5e1e1bb7db9..5908b93ac7b 100644
Binary files a/packages/terra-dropdown-button/tests/wdio/__snapshots__/reference/terra-default-theme/en/chrome_medium/dropdown-button-spec/clicking_outside_closes_dropdown.png and b/packages/terra-dropdown-button/tests/wdio/__snapshots__/reference/terra-default-theme/en/chrome_medium/dropdown-button-spec/clicking_outside_closes_dropdown.png differ
diff --git a/packages/terra-dropdown-button/tests/wdio/__snapshots__/reference/terra-default-theme/en/chrome_medium/dropdown-button-spec/tab.png b/packages/terra-dropdown-button/tests/wdio/__snapshots__/reference/terra-default-theme/en/chrome_medium/dropdown-button-spec/tab.png
index 5908b93ac7b..5e1e1bb7db9 100644
Binary files a/packages/terra-dropdown-button/tests/wdio/__snapshots__/reference/terra-default-theme/en/chrome_medium/dropdown-button-spec/tab.png and b/packages/terra-dropdown-button/tests/wdio/__snapshots__/reference/terra-default-theme/en/chrome_medium/dropdown-button-spec/tab.png differ
diff --git a/packages/terra-dropdown-button/tests/wdio/__snapshots__/reference/terra-default-theme/en/chrome_medium/split-button-spec/clicking_outside_closes_dropdown.png b/packages/terra-dropdown-button/tests/wdio/__snapshots__/reference/terra-default-theme/en/chrome_medium/split-button-spec/clicking_outside_closes_dropdown.png
index 065e2dea32b..c98bb82456b 100644
Binary files a/packages/terra-dropdown-button/tests/wdio/__snapshots__/reference/terra-default-theme/en/chrome_medium/split-button-spec/clicking_outside_closes_dropdown.png and b/packages/terra-dropdown-button/tests/wdio/__snapshots__/reference/terra-default-theme/en/chrome_medium/split-button-spec/clicking_outside_closes_dropdown.png differ
diff --git a/packages/terra-dropdown-button/tests/wdio/__snapshots__/reference/terra-default-theme/en/chrome_medium/split-button-spec/tab.png b/packages/terra-dropdown-button/tests/wdio/__snapshots__/reference/terra-default-theme/en/chrome_medium/split-button-spec/tab.png
index c98bb82456b..065e2dea32b 100644
Binary files a/packages/terra-dropdown-button/tests/wdio/__snapshots__/reference/terra-default-theme/en/chrome_medium/split-button-spec/tab.png and b/packages/terra-dropdown-button/tests/wdio/__snapshots__/reference/terra-default-theme/en/chrome_medium/split-button-spec/tab.png differ
diff --git a/packages/terra-overlay/CHANGELOG.md b/packages/terra-overlay/CHANGELOG.md
index 281811ae0ae..6d04a5dc383 100644
--- a/packages/terra-overlay/CHANGELOG.md
+++ b/packages/terra-overlay/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## Unreleased
 
 * Changed
+  * Upgrade focus-trap-react to version ^8.0.0.
   * Updated dependencies to not be hard-coded.
 
 ## 3.69.0 - (November 2, 2021)
diff --git a/packages/terra-overlay/package.json b/packages/terra-overlay/package.json
index 3b8cba6426c..0434aa5a7e3 100644
--- a/packages/terra-overlay/package.json
+++ b/packages/terra-overlay/package.json
@@ -28,7 +28,7 @@
   },
   "dependencies": {
     "classnames": "^2.2.5",
-    "focus-trap-react": "^6.0.0",
+    "focus-trap-react": "^8.0.0",
     "keycode-js": "^3.1.0",
     "mutationobserver-shim": "<=0.3.3",
     "prop-types": "^15.5.8",