diff --git a/specs/Modal.events.spec.js b/specs/Modal.events.spec.js
index 8c9d5f2b..b24b343b 100644
--- a/specs/Modal.events.spec.js
+++ b/specs/Modal.events.spec.js
@@ -222,6 +222,7 @@ export default () => {
       withModal(props, null, modal => {
         mouseDownAt(moverlay(modal));
         mouseUpAt(mcontent(modal));
+        clickAt(moverlay(modal));
         requestCloseCallback.called.should.not.be.ok();
       });
     });
@@ -236,9 +237,40 @@ export default () => {
       withModal(props, null, modal => {
         mouseDownAt(mcontent(modal));
         mouseUpAt(moverlay(modal));
+        clickAt(moverlay(modal));
         requestCloseCallback.called.should.not.be.ok();
       });
     });
+
+    it("click on button containing stopPropagation inside modal shouldn't block closing", () => {
+      const requestCloseCallback = sinon.spy();
+      let innerButton = null;
+      let innerButtonRef = ref => {
+        innerButton = ref;
+      };
+      function click(event) {
+        event.stopPropagation();
+      }
+
+      withModal(
+        {
+          isOpen: true,
+          onRequestClose: requestCloseCallback
+        },
+        <button ref={innerButtonRef} onClick={click} />,
+        modal => {
+          // imitate regular click with all mouse events on button inside modal
+          mouseDownAt(innerButton);
+          mouseUpAt(innerButton);
+          clickAt(innerButton);
+          // imitate regular click with all mouse events on modal overlay
+          mouseDownAt(moverlay(modal));
+          mouseUpAt(moverlay(modal));
+          clickAt(moverlay(modal));
+          requestCloseCallback.called.should.be.ok();
+        }
+      );
+    });
   });
 
   it("should not stop event propagation", () => {
diff --git a/src/components/ModalPortal.js b/src/components/ModalPortal.js
index 7f20df67..5c891da3 100644
--- a/src/components/ModalPortal.js
+++ b/src/components/ModalPortal.js
@@ -322,13 +322,15 @@ export default class ModalPortal extends Component {
     if (!this.props.shouldCloseOnOverlayClick && event.target == this.overlay) {
       event.preventDefault();
     }
+    this.shouldClose = null;
   };
 
   handleContentOnClick = () => {
     this.shouldClose = false;
   };
 
-  handleContentOnMouseDown = () => {
+  handleContentOnMouseDown = event => {
+    event.stopPropagation();
     this.shouldClose = false;
   };