1 files changed, 3 insertions, 4 deletions

diff --git a/packages/forms/src/select/index.tsx b/packages/forms/src/select/index.tsx
index d7479f63e..7806baa2a 100644
--- a/packages/forms/src/select/index.tsx
+++ b/packages/forms/src/select/index.tsx
@@ -187,10 +187,8 @@ class SelectComponent extends Component<IProps> {
   componentDidUpdate() {
     const { open } = this.state;
 
-    if (this.searchInputRef && this.searchInputRef.current) {
-      if (open) {
-        this.searchInputRef.current.focus();
-      }
+    if (this.searchInputRef && this.searchInputRef.current && open) {
+      this.searchInputRef.current.focus();
     }
   }
 
@@ -228,6 +226,7 @@ class SelectComponent extends Component<IProps> {
   }
 
   componentWillUnmount() {
+    // eslint-disable-next-line unicorn/no-invalid-remove-event-listener
     window.removeEventListener('keydown', this.arrowKeysHandler.bind(this));
   }