diff --git a/src/Button.js b/src/Button.js
index 48d937d..1fe552c 100644
--- a/src/Button.js
+++ b/src/Button.js
@@ -69,6 +69,14 @@ class AriaMenuButtonButton extends React.Component {
     this.context.ambManager.toggleMenu({}, { focusMenu: false });
   };
 
+  // The Space key behaves like mousedown/mouseup in some browsers such as Firefox.
+  // To prevent an unexpected click event when the space key is released, event.preventDefault () is set in keyUp.
+  handleKeyUp = (event) => {
+    if (event.key === ' ' || event.key === 'Enter') {
+      event.preventDefault();
+    }
+  }
+
   render() {
     const props = this.props;
     const ambManager = this.context.ambManager;
@@ -82,6 +90,7 @@ class AriaMenuButtonButton extends React.Component {
       'aria-expanded': ambManager.isOpen,
       'aria-disabled': props.disabled,
       onKeyDown: this.handleKeyDown,
+      onKeyUp: this.handleKeyUp,
       onClick: this.handleClick
     };
 
diff --git a/src/__tests__/Button.test.js b/src/__tests__/Button.test.js
index cab3ea2..4d3817b 100644
--- a/src/__tests__/Button.test.js
+++ b/src/__tests__/Button.test.js
@@ -148,6 +148,46 @@ describe('<Button>', function() {
     expect(enterEvent.preventDefault).not.toHaveBeenCalled();
     expect(ambManager.toggleMenu).not.toHaveBeenCalled();
   });
+
+  test('prevent manager event when enter key is released.', function() {
+    const wrapper = shallow(
+      el(Button, { tag: 'button' }, 'foo'),
+      shallowOptions
+    );
+    jest.spyOn(ambManager, 'toggleMenu').mockImplementation(() => {
+      ambManager.isOpen = !ambManager.isOpen;
+    });
+
+    wrapper.simulate('click');
+    expect(ambManager.isOpen).toBe(true);
+
+    wrapper.simulate('keydown', enterEvent);
+    expect(ambManager.isOpen).toBe(false);
+
+    wrapper.simulate('keyup', enterEvent);
+    expect(ambManager.isOpen).toBe(false);
+    expect(enterEvent.preventDefault).toHaveBeenCalled();
+  });
+
+  test('prevent manager event when space key is released.', function() {
+    const wrapper = shallow(
+      el(Button, { tag: 'button' }, 'foo'),
+      shallowOptions
+    );
+    jest.spyOn(ambManager, 'toggleMenu').mockImplementation(() => {
+      ambManager.isOpen = !ambManager.isOpen;
+    });
+
+    wrapper.simulate('click');
+    expect(ambManager.isOpen).toBe(true);
+
+    wrapper.simulate('keydown', spaceEvent);
+    expect(ambManager.isOpen).toBe(false);
+
+    wrapper.simulate('keyup', spaceEvent);
+    expect(ambManager.isOpen).toBe(false);
+    expect(spaceEvent.preventDefault).toHaveBeenCalled();
+  });
 });
 
 describe('<Button> rendered via renderToString', function() {
diff --git a/src/__tests__/__snapshots__/Button.test.js.snap b/src/__tests__/__snapshots__/Button.test.js.snap
index d51badb..23db396 100644
--- a/src/__tests__/__snapshots__/Button.test.js.snap
+++ b/src/__tests__/__snapshots__/Button.test.js.snap
@@ -11,6 +11,7 @@ exports[`<Button> DOM with all possible props and element child 1`] = `
   id="foo"
   onClick={[Function]}
   onKeyDown={[Function]}
+  onKeyUp={[Function]}
   role="button"
   style={
     Object {
@@ -31,6 +32,7 @@ exports[`<Button> DOM with only required props and text child 1`] = `
   aria-haspopup={true}
   onClick={[Function]}
   onKeyDown={[Function]}
+  onKeyUp={[Function]}
   role="button"
   tabIndex="0"
 >