diff --git a/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-save/advanced-gas-fee-save.js b/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-save/advanced-gas-fee-save.js
index 98ec9261b..47c3abd28 100644
--- a/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-save/advanced-gas-fee-save.js
+++ b/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-save/advanced-gas-fee-save.js
@@ -11,7 +11,7 @@ import I18nValue from '../../../ui/i18n-value';
 import { useAdvancedGasFeePopoverContext } from '../context';
 
 const AdvancedGasFeeSaveButton = () => {
-  const { closeAllModals } = useTransactionModalContext();
+  const { closeModal } = useTransactionModalContext();
   const { updateTransactionEventFragment } = useTransactionEventFragment();
   const { updateTransaction } = useGasFeeContext();
   const {
@@ -33,7 +33,7 @@ const AdvancedGasFeeSaveButton = () => {
         gas_edit_type: 'advanced',
       },
     });
-    closeAllModals();
+    closeModal(['advancedGasFee', 'editGasFee']);
   };
 
   return (
diff --git a/ui/components/app/cancel-speedup-popover/cancel-speedup-popover.js b/ui/components/app/cancel-speedup-popover/cancel-speedup-popover.js
index 077b19ca6..9bcadbc00 100644
--- a/ui/components/app/cancel-speedup-popover/cancel-speedup-popover.js
+++ b/ui/components/app/cancel-speedup-popover/cancel-speedup-popover.js
@@ -84,7 +84,7 @@ const CancelSpeedupPopover = () => {
     } else {
       speedUpTransaction();
     }
-    closeModal('cancelSpeedUpTransaction');
+    closeModal(['cancelSpeedUpTransaction']);
   };
 
   return (
diff --git a/ui/components/app/edit-gas-fee-popover/edit-gas-item/edit-gas-item.js b/ui/components/app/edit-gas-fee-popover/edit-gas-item/edit-gas-item.js
index d1b8bc147..ddf19dbce 100644
--- a/ui/components/app/edit-gas-fee-popover/edit-gas-item/edit-gas-item.js
+++ b/ui/components/app/edit-gas-fee-popover/edit-gas-item/edit-gas-item.js
@@ -87,7 +87,7 @@ const EditGasItem = ({ priorityLevel }) => {
         },
       });
 
-      closeModal('editGasFee');
+      closeModal(['editGasFee']);
 
       if (priorityLevel === PRIORITY_LEVELS.TEN_PERCENT_INCREASED) {
         updateTransactionToTenPercentIncreasedGasFee();
diff --git a/ui/contexts/transaction-modal.js b/ui/contexts/transaction-modal.js
index 51ebffa51..cfe563e01 100644
--- a/ui/contexts/transaction-modal.js
+++ b/ui/contexts/transaction-modal.js
@@ -6,13 +6,15 @@ export const TransactionModalContext = createContext({});
 export const TransactionModalContextProvider = ({ children }) => {
   const [openModals, setOpenModals] = useState([]);
 
-  const closeModal = (modalName) => {
-    const index = openModals.indexOf(modalName);
+  const closeModal = (modalNames) => {
     if (openModals < 0) {
       return;
     }
     const modals = [...openModals];
-    modals.splice(index, 1);
+    modalNames.forEach((modal) => {
+      const index = openModals.indexOf(modal);
+      modals.splice(index, 1);
+    });
     setOpenModals(modals);
   };