diff --git a/BTCPayServer/Services/Shopify/OrderTransactionRegisterLogic.cs b/BTCPayServer/Services/Shopify/OrderTransactionRegisterLogic.cs
index a43fc730d..6bb245669 100644
--- a/BTCPayServer/Services/Shopify/OrderTransactionRegisterLogic.cs
+++ b/BTCPayServer/Services/Shopify/OrderTransactionRegisterLogic.cs
@@ -18,7 +18,7 @@ namespace BTCPayServer.Services.Shopify
 
         private static TransactionDataHolder GetParentTransaction(List<TransactionDataHolder> txs)
         {
-            var keywords = new[] {"bitcoin", "btc"};
+            var keywords = new[] {"bitcoin", "btc", "btcpayserver", "btcpay server"};
             return txs.FirstOrDefault(holder =>keywords .Any(s => holder.gateway.Contains(s, StringComparison.InvariantCultureIgnoreCase)));
         }
         
diff --git a/BTCPayServer/wwwroot/shopify/btcpay-shopify.js b/BTCPayServer/wwwroot/shopify/btcpay-shopify.js
index 1a2ff14ef..2ba40d764 100644
--- a/BTCPayServer/wwwroot/shopify/btcpay-shopify.js
+++ b/BTCPayServer/wwwroot/shopify/btcpay-shopify.js
@@ -155,7 +155,7 @@ window.BTCPayShopifyIntegrationModule = function () {
         insertElement(buttonElement, pageItems.orderConfirmed);
     }
 
-    if (["bitcoin", "btc"].filter(value => pageItems.paymentMethod.innerText.toLowerCase().indexOf(value) !== -1).length === 0) {
+    if (["bitcoin", "btc", "btcpayserver", "btcpay server"].filter(value => pageItems.paymentMethod.innerText.toLowerCase().indexOf(value) !== -1).length === 0) {
         return;
     }
     showPaymentInstructions();