diff --git a/CHANGELOG.md b/CHANGELOG.md
index 748ff84c62..38e830951f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 - Show debug panel correctly for components with no owner @miroslavstastny ([#2055](https://github.com/stardust-ui/react/pull/2055))
 - Correctly handle empty key actions in RTL @miroslavstastny ([#2060](https://github.com/stardust-ui/react/pull/2060))
 - Accessibility improvements for `tree` and `splitButton` @kolaps33 ([#2032](https://github.com/stardust-ui/react/pull/2032))
+- Fixing a core keydown disconnect issue @dzearing ([#2056](https://github.com/stardust-ui/react/pull/2056))
 
 ### Features
 - Add `menu` prop on `ToolbarMenuItem` component @mnajdova ([#1984](https://github.com/stardust-ui/react/pull/1984))
diff --git a/packages/react-bindings/src/FocusZone/FocusZone.tsx b/packages/react-bindings/src/FocusZone/FocusZone.tsx
index 64b946a10d..88dc04b8fa 100644
--- a/packages/react-bindings/src/FocusZone/FocusZone.tsx
+++ b/packages/react-bindings/src/FocusZone/FocusZone.tsx
@@ -196,7 +196,7 @@ export default class FocusZone extends React.Component<FocusZoneProps> implement
       _outerZones.delete(this)
     }
 
-    if (this.windowElement) {
+    if (this.windowElement && _outerZones.size === 0) {
       this.windowElement.removeEventListener('keydown', this._onKeyDownCapture, true)
     }