diff --git a/ui/src/Components/Modal/index.js b/ui/src/Components/Modal/index.js
index 7fe8274c2..7c15445af 100644
--- a/ui/src/Components/Modal/index.js
+++ b/ui/src/Components/Modal/index.js
@@ -4,7 +4,7 @@ import PropTypes from "prop-types";
 
 import { observer } from "mobx-react";
 
-import { disableBodyScroll, enableBodyScroll } from "body-scroll-lock";
+import { disableBodyScroll, clearAllBodyScrollLocks } from "body-scroll-lock";
 
 import {
   MountModal,
@@ -23,7 +23,7 @@ const Modal = observer(
       if (isOpen) {
         disableBodyScroll(document.querySelector(".modal"));
       } else {
-        enableBodyScroll(document.querySelector(".modal"));
+        clearAllBodyScrollLocks();
       }
     };