diff --git a/src/OptionList.tsx b/src/OptionList.tsx
index d2f7738ab..bfc2a9f9c 100644
--- a/src/OptionList.tsx
+++ b/src/OptionList.tsx
@@ -218,6 +218,9 @@ const OptionList: React.RefForwardingComponent<
         // >>> Close
         case KeyCode.ESC: {
           onToggleOpen(false);
+          if (open) {
+            event.stopPropagation();
+          }
         }
       }
     },
diff --git a/tests/Select.test.tsx b/tests/Select.test.tsx
index 99a20bb84..961d39aaf 100644
--- a/tests/Select.test.tsx
+++ b/tests/Select.test.tsx
@@ -666,7 +666,12 @@ describe('Select.Basic', () => {
   });
 
   it('close on ESC', () => {
-    const wrapper = mount(<Select />);
+    const onKeyDown = jest.fn();
+    const wrapper = mount(
+      <div onKeyDown={onKeyDown}>
+        <Select />
+      </div>,
+    );
     toggleOpen(wrapper);
     wrapper
       .find('input')
@@ -677,6 +682,12 @@ describe('Select.Basic', () => {
 
     expect(wrapper.find('input').props().value).toBe('');
     expectOpen(wrapper, false);
+    expect(onKeyDown).toHaveBeenCalledTimes(0);
+
+    // should keep propagation when optionList is closed
+    wrapper.simulate('keyDown', { which: KeyCode.ESC });
+    wrapper.update();
+    expect(onKeyDown).toHaveBeenCalledTimes(1);
   });
 
   it('close after select', () => {