diff --git a/lib/components/ModalPortal.js b/lib/components/ModalPortal.js
index 78d846b4..ee820065 100644
--- a/lib/components/ModalPortal.js
+++ b/lib/components/ModalPortal.js
@@ -45,12 +45,10 @@ var ModalPortal = module.exports = React.createClass({
     // Focus only needs to be set once when the modal is being opened
     if (!this.props.isOpen && newProps.isOpen) {
       this.setFocusAfterRender(true);
-    }
-
-    if (newProps.isOpen === true)
       this.open();
-    else if (newProps.isOpen === false)
+    } else if (this.props.isOpen && !newProps.isOpen) {
       this.close();
+    }
   },
 
   componentDidUpdate: function () {