diff --git a/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/SendTransactionFragment.kt b/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/SendTransactionFragment.kt
index e1e2afc..6dffca3 100644
--- a/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/SendTransactionFragment.kt
+++ b/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/SendTransactionFragment.kt
@@ -358,15 +358,19 @@ class SendTransactionFragment : ConnectedFragment(), ZXingScannerView.ResultHand
 
             tietTo.setText(invoice.to)
 
-            for (i in 0 until mBalancesDetailsAdapter!!.count) {
-                if (mBalancesDetailsAdapter!!.getItem(i)!!.symbol == invoice.currency.toUpperCase()) {
+            // Try to select the invoice's Asset in the Assets spinner
+            for (i in 0 until (mBalancesDetailsAdapter?.count ?: 0)) {
+                if (mBalancesDetailsAdapter?.getItem(i)?.symbol == invoice.currency.toUpperCase() ||
+                    (invoice.currency.startsWith("bit", true) &&
+                            invoice.currency.replaceFirst("bit", "").toUpperCase() ==
+                            mBalancesDetailsAdapter?.getItem(i)?.symbol)) {
                     spAsset.setSelection(i)
                     break
                 }
             }
+            
             tietMemo.setText(invoice.memo)
 
-
             var amount = 0.0
             for (nextItem in invoice.lineItems) {
                 amount += nextItem.quantity * nextItem.price