diff --git a/packages/taler-wallet-webextension/src/cta/Payment/views.tsx b/packages/taler-wallet-webextension/src/cta/Payment/views.tsx
index c799607ad..0383960ed 100644
--- a/packages/taler-wallet-webextension/src/cta/Payment/views.tsx
+++ b/packages/taler-wallet-webextension/src/cta/Payment/views.tsx
@@ -167,14 +167,16 @@ export function BaseView(state: SupportedStates): VNode {
           />
         )}
       </section>
-      <ButtonsSection
-        amount={state.amount}
-        balance={state.balance}
-        payStatus={state.payStatus}
-        uri={state.uri}
-        payHandler={state.status === "ready" ? state.payHandler : undefined}
-        goToWalletManualWithdraw={state.goToWalletManualWithdraw}
-      />
+      {state.status !== "completed" ? (
+        <ButtonsSection
+          amount={state.amount}
+          balance={state.balance}
+          payStatus={state.payStatus}
+          uri={state.uri}
+          payHandler={state.status === "ready" ? state.payHandler : undefined}
+          goToWalletManualWithdraw={state.goToWalletManualWithdraw}
+        />
+      ) : undefined}
       <section>
         <Link upperCased onClick={state.cancel}>
           <i18n.Translate>Cancel</i18n.Translate>
@@ -433,19 +435,7 @@ export function ButtonsSection({
     );
   }
 
-  // if (state.status === "completed") {
-  //   if (state.payResult.type === ConfirmPayResultType.Pending) {
-  //     return (
-  //       <section>
-  //         <div>
-  //           <p>
-  //             <i18n.Translate>Processing</i18n.Translate>...
-  //           </p>
-  //         </div>
-  //       </section>
-  //     );
-  //   }
-  // }
+  const error: never = payStatus;
 
   return <Fragment />;
 }
diff --git a/packages/taler-wallet-webextension/src/wallet/Application.tsx b/packages/taler-wallet-webextension/src/wallet/Application.tsx
index eb2a7cc80..c7e69964b 100644
--- a/packages/taler-wallet-webextension/src/wallet/Application.tsx
+++ b/packages/taler-wallet-webextension/src/wallet/Application.tsx
@@ -288,6 +288,9 @@ export function Application(): VNode {
               <Route
                 path={Pages.ctaInvoicePay}
                 component={InvoicePayPage}
+                goToWalletManualWithdraw={(amount?: string) =>
+                  redirectTo(Pages.ctaWithdrawManual({ amount }))
+                }
                 onClose={() => redirectTo(Pages.balance)}
               />
               <Route