diff --git a/frontend/app/components/Modal/Modal.tsx b/frontend/app/components/Modal/Modal.tsx
index 9dc622a18..cc1e79e71 100644
--- a/frontend/app/components/Modal/Modal.tsx
+++ b/frontend/app/components/Modal/Modal.tsx
@@ -1,16 +1,26 @@
-import React from 'react';
+import React, { useEffect } from 'react';
 import ReactDOM from 'react-dom';
 import ModalOverlay from './ModalOverlay';
+import { useHistory } from 'react-router';
 
 export default function Modal({ component, props, hideModal }: any) {
-    return component ? (
-        ReactDOM.createPortal(
-            <ModalOverlay hideModal={hideModal} left={!props.right} right={props.right}>
-                {component}
-            </ModalOverlay>,
-            document.querySelector('#modal-root')
-        )
-    ) : (
-        <></>
-    );
+  const history = useHistory();
+
+  useEffect(() => {
+    return history.listen((location) => {
+      if (history.action === 'POP') {
+        document.querySelector('body').style.overflow = 'visible';
+      }
+    });
+  });
+  return component ? (
+    ReactDOM.createPortal(
+      <ModalOverlay hideModal={hideModal} left={!props.right} right={props.right}>
+        {component}
+      </ModalOverlay>,
+      document.querySelector('#modal-root')
+    )
+  ) : (
+    <></>
+  );
 }