diff --git a/BTCPayServer/Views/Invoice/Checkout-Body.cshtml b/BTCPayServer/Views/Invoice/Checkout-Body.cshtml
index e9c046c45..307bddabb 100644
--- a/BTCPayServer/Views/Invoice/Checkout-Body.cshtml
+++ b/BTCPayServer/Views/Invoice/Checkout-Body.cshtml
@@ -298,11 +298,20 @@
                                     :to-currency-due="srvModel.btcDue"
                                     :autoload="selectedThirdPartyProcessor === 'coinswitch'"
                                     :to-currency-address="srvModel.btcAddress">
-                            <iframe v-if="mode === 'inline'" :url="url" v-show="url"></iframe>
-                            <a v-else-if="mode === 'popup'" 
-                               v-on:click="openDialog($event)" :href="url" class="action-button" v-show="url">
+                            <div>
+                            <a v-on:click="openDialog($event)" :href="url" class="action-button" v-show="url && !opened">
                                 {{$t("Pay with CoinSwitch")}}
                             </a>
+                            
+                                <iframe  
+                                    v-if="showInlineIFrame"
+                                    v-on:load="onLoadIframe"
+                                style="height: 100%; position: fixed; top: 0; width: 100%; left: 0;"
+                                sandbox="allow-scripts allow-forms allow-popups allow-same-origin"
+                                :src="url"></iframe>
+
+                            </div>
+
                         </coinswitch>
                     }
                     
diff --git a/BTCPayServer/wwwroot/checkout/coinswitch.html b/BTCPayServer/wwwroot/checkout/coinswitch.html
index e9dd6e509..224a9961c 100644
--- a/BTCPayServer/wwwroot/checkout/coinswitch.html
+++ b/BTCPayServer/wwwroot/checkout/coinswitch.html
@@ -4,7 +4,6 @@
     <meta charset="UTF-8">
     <title>CoinSwitch</title>
     <script>
-        debugger;
         var script = document.createElement('script'),
             head = document.head || document.getElementsByTagName('head')[0];
         script.src = window.location.protocol + '//files.coinswitch.co/public/js/cs_switch.js';
@@ -27,12 +26,14 @@
             var toCurrencyDue = qs["toCurrencyDue"];
             var toCurrencyAddress = qs["toCurrencyAddress"];
             var toCurrency = qs["toCurrency"];
-
+            var mode = qs["mode"];
+            document.body.classList.add(mode);
+            
             var payment = new Coinswitch(merchantId);
             var config = {
-                to_currency: toCurrency,
+                to_currency: toCurrency.toLowerCase(),
                 to_currency_address: toCurrencyAddress,
-                to_amount: toCurrencyDue
+                to_amount: parseFloat(toCurrencyDue)
             };
             waitForCoinSwitch();
 
@@ -47,39 +48,27 @@
                 });
                 payment.on("Exchange:Closed", function () {
                     window.close();
+                    window.postMessage("popup-closed", "*");
                 })
             }
         });
     </script>
     <style>
-        #CoinSwitchPayment .cs-pay {
+        body.popup #CoinSwitchPayment .cs-pay {
             width: 100%;
             height: 100%;
         }
-
-        #CoinSwitchPayment .cs-pay__main {
+        
+        body.popup #CoinSwitchPayment .cs-pay__main {
             width: 100%;
-            height: 100%;
+            min-height: 90vh;
             padding-bottom: 20px;
         }
 
-        #CoinSwitchPayment .cs-pay__dismiss-row {
+        body.popup #CoinSwitchPayment .cs-pay__dismiss-row {
             display: none;
         }
-
-        #CoinSwitchPayment .cs-pay__footer {
-            position: absolute;
-            left: 0;
-            bottom: 0px;
-            width: 100%;
-            height: 20px;
-
-            z-index: 10001;
-        }
-
-        #CoinSwitchPayment .cs-pay__powered-text {
-            color: black;
-        }
+        
     </style>
 </head>
 <body>
diff --git a/BTCPayServer/wwwroot/checkout/js/coinswitchComponent.js b/BTCPayServer/wwwroot/checkout/js/coinswitchComponent.js
index 338692206..8503563be 100644
--- a/BTCPayServer/wwwroot/checkout/js/coinswitchComponent.js
+++ b/BTCPayServer/wwwroot/checkout/js/coinswitchComponent.js
@@ -2,8 +2,14 @@
     {
         props: ["toCurrency", "toCurrencyDue", "toCurrencyAddress", "merchantId", "autoload", "mode"],
         data: function () {
+            return {
+                opened: false
+            };
         },
         computed: {
+            showInlineIFrame: function(){
+                return this.url && this.opened;
+            },
             url: function () {
                 return window.location.origin + "/checkout/coinswitch.html?" +
                     "&toCurrency=" +
@@ -12,6 +18,8 @@
                     this.toCurrencyAddress +
                     "&toCurrencyDue=" +
                     this.toCurrencyDue +
+                    "&mode=" +
+                    this.mode +
                     (this.merchantId ? "&merchant_id=" + this.merchantId : "");
             }
         },
@@ -21,17 +29,37 @@
                     e.preventDefault();
                 }
 
-                var coinSwitchWindow = window.open(
-                    this.url,
-                    'CoinSwitch',
-                    'width=600,height=470,toolbar=0,menubar=0,location=0,status=1,scrollbars=1,resizable=0,left=0,top=0');
-                coinSwitchWindow.opener = null;
-                coinSwitchWindow.focus();
-                
+                if(this.mode === 'inline'){
+                    this.opened = true;
+                    
+                }else if(this.mode ==="popup"){
+                    var coinSwitchWindow = window.open(
+                        this.url,
+                        'CoinSwitch',
+                        'width=360,height=650,toolbar=0,menubar=0,location=0,status=1,scrollbars=1,resizable=0,left=0,top=0');
+                    coinSwitchWindow.opener = null;
+                    coinSwitchWindow.focus();
+                }
+            },
+            closeDialog(){
+                if(this.mode === 'inline'){
+                    this.opened = false;
+                }
+            },
+            onLoadIframe(event){
+                $("#prettydropdown-DefaultLang").hide();
+                var c = this.closeDialog.bind(this);
+                event.currentTarget.contentWindow.addEventListener("message", function(evt){
+                    if(evt && evt.data == "popup-closed"){
+                        c();
+
+                        $("#prettydropdown-DefaultLang").show();
+                    }
+                });
             }
         },
         mounted: function () {
-            if(this.autoload && this.mode === 'popup'){
+            if(this.autoload){
                 this.openDialog();
             }
         }
