diff --git a/centrifuge-app/src/components/InvestRedeem/InvestRedeem.tsx b/centrifuge-app/src/components/InvestRedeem/InvestRedeem.tsx
index caf1a0e0ac..c69c072b6d 100644
--- a/centrifuge-app/src/components/InvestRedeem/InvestRedeem.tsx
+++ b/centrifuge-app/src/components/InvestRedeem/InvestRedeem.tsx
@@ -534,7 +534,11 @@ function InvestForm({ onCancel, hasInvestment, autoFocus, investLabel = 'Invest'
             </Stack>
           </Stack>
         ) : changeOrderFormShown ? (
-          renderInput(() => setChangeOrderFormShown(false))
+          state.needsPoolCurrencyApproval ? (
+            renderInput(onCancel, { onClick: actions.approvePoolCurrency, loading: isApproving })
+          ) : (
+            renderInput(onCancel)
+          )
         ) : hasPendingOrder ? (
           <PendingOrder
             type="invest"
@@ -705,7 +709,11 @@ function RedeemForm({ onCancel, autoFocus }: RedeemFormProps) {
             </Stack>
           </Stack>
         ) : changeOrderFormShown ? (
-          renderInput(() => setChangeOrderFormShown(false))
+          state.needsTrancheTokenApproval ? (
+            renderInput(onCancel, { onClick: actions.approveTrancheToken, loading: isApproving })
+          ) : (
+            renderInput(onCancel)
+          )
         ) : hasPendingOrder ? (
           <PendingOrder
             type="redeem"