Merge pull request #37069 from bernhardoj/fix/36923-cant-save-workspa…

…ce-name
Expensify · Mar 4, 2024 · f55b779 · f55b779
2 parents cb45bb2 + e892ac3
commit f55b779
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/src/components/OptionsSelector/BaseOptionsSelector.js b/src/components/OptionsSelector/BaseOptionsSelector.js
@@ -125,8 +125,11 @@ class BaseOptionsSelector extends Component {
             // Unregister the shortcut before registering a new one to avoid lingering shortcut listener
             this.unSubscribeFromKeyboardShortcut();
             if (this.props.isFocused) {
+                this.subscribeActiveElement();
                 this.subscribeToEnterShortcut();
                 this.subscribeToCtrlEnterShortcut();
+            } else {
+                this.unSubscribeActiveElement();
             }
         }