diff --git a/frontend/src/_components/AppModal.jsx b/frontend/src/_components/AppModal.jsx
index 7c1ffb4438..c2530e44ea 100644
--- a/frontend/src/_components/AppModal.jsx
+++ b/frontend/src/_components/AppModal.jsx
@@ -124,7 +124,13 @@ export function AppModal({
       title={title}
       footerContent={
         <>
-          <ButtonSolid variant="tertiary" onClick={closeModal} data-cy="cancel-button" className="modal-footer-divider">
+          <ButtonSolid
+            variant="tertiary"
+            onClick={closeModal}
+            data-cy="cancel-button"
+            className="modal-footer-divider"
+            disabled={isLoading}
+          >
             Cancel
           </ButtonSolid>
           <ButtonSolid
@@ -157,6 +163,7 @@ export function AppModal({
               style={{
                 borderColor: errorText ? '#DB4324 !important' : 'initial',
               }}
+              disabled={isLoading}
             />
             {errorText ? (
               <small