diff --git a/src/layouts/payment/payment.vue b/src/layouts/payment/payment.vue
index d59a27f88..73050bf61 100644
--- a/src/layouts/payment/payment.vue
+++ b/src/layouts/payment/payment.vue
@@ -5,7 +5,11 @@
             <div class="row justify-content-center">
                 <div class="col-md-6">
                     <funnelHeader cmsWidgetName="FunnelHeaderWidget" ref="funnelHeader" />
+                </div>
+            </div>
 
+            <div class="row justify-content-center">
+                <div class="col-md-6 col-xl-4 p-0">
                     <div>
                         <alert
                             ref="piaCCErrorAlert"
@@ -25,11 +29,7 @@
                             alertClass="alert-danger"
                             v-bind:isDismissible="false" />
                     </div>
-                </div>
-            </div>
 
-            <div class="row justify-content-center">
-                <div class="col-md-6 col-xl-4 p-0">
                     <div id="card-container">
                         <iframe
                             v-resize
diff --git a/src/router/index.js b/src/router/index.js
index 377652a95..d23d15c38 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -174,7 +174,11 @@ router.beforeEach(async (to, from, next) => {
     const notToPIAReturn = toQueryPage != "payment-pia-return";
     const isInIframe = window !== window.top;
 
-    if (isInIframe && notToPIAReturn) {
+    // fromPaymentToConfirmation workaround for navigating from an iframe but
+    // isInIframe evaluates to false for some reason when navigating from payment to confirmation
+    const fromPaymentToConfirmation = fromQueryPage === "payment" && toQueryPage === "confirmation";
+
+    if ((isInIframe && notToPIAReturn) || fromPaymentToConfirmation) {
         const newUrl = `${window.top.location.origin}${to.href}`;
         window.top.location.href = newUrl;
         // Refresh page if navigating to self to prevent locking.