diff --git a/src/containers/modal.jsx b/src/containers/modal.jsx
index 30dc4277b56a8a7aabcf2dd204d3be9c14c5b072..7aa7571a5ee58f930cf5395ae70bfe7b71ff10b7 100644
--- a/src/containers/modal.jsx
+++ b/src/containers/modal.jsx
@@ -19,7 +19,7 @@ class Modal extends React.Component {
     componentDidMount () {
         // Add a history event only if it's not currently for our modal. This
         // avoids polluting the history with many entries. We only need one.
-        this.pushHistory(this.id, history.state === null);
+        this.pushHistory(this.id, (history.state === null || history.state !== this.id));
     }
     componentWillUnmount () {
         this.removeEventListeners();