diff --git a/src/components/MintSettings.vue b/src/components/MintSettings.vue
index e48a7eab..050748a2 100644
--- a/src/components/MintSettings.vue
+++ b/src/components/MintSettings.vue
@@ -249,9 +249,12 @@
           <q-item-section>
             <q-item-label overline>Multimint Swaps</q-item-label>
             <q-item-label caption
-              >Swap funds from one mint to another via Lightning. Note: Leave
-              room for potential Lightning fees.</q-item-label
-            >
+              >Swap funds from one mint to another via Lightning. Note: This is
+              an experimental feature and should be used carefully. Leave room
+              for potential Lightning fees. If the incoming payment does not
+              succeed, check the incoming pending invoice manually by clicking
+              the refresh button.
+            </q-item-label>
           </q-item-section>
         </q-item>
         <q-item>
@@ -306,12 +309,20 @@
               )
             "
             :disable="
-              !swapData.from_url || !swapData.to_url || !(swapData.amount > 0)
+              !swapData.from_url ||
+              !swapData.to_url ||
+              !(swapData.amount > 0) ||
+              swapData.from_url == swapData.to_url
             "
+            :loading="swapBlocking"
           >
             <q-icon size="xs" name="swap_horiz" class="q-pr-xs" />
-            Swap</q-btn
-          >
+            Swap
+            <template v-slot:loading>
+              <q-spinner-hourglass size="xs" />
+              Swap
+            </template>
+          </q-btn>
         </q-item>
       </q-list>
     </div>
@@ -481,6 +492,7 @@ import { useSettingsStore } from "src/stores/settings";
 import { useNostrStore } from "src/stores/nostr";
 import { useP2PKStore } from "src/stores/p2pk";
 import { useWorkersStore } from "src/stores/workers";
+import { notifyError, notifyWarning } from "src/js/notify";
 
 export default defineComponent({
   name: "MintSettings",
@@ -516,6 +528,7 @@ export default defineComponent({
         show: false,
       },
       showEditMintDialog: false,
+      swapBlocking: false,
     };
   },
   computed: {
@@ -532,6 +545,7 @@ export default defineComponent({
     ]),
     ...mapState(useNostrStore, ["pubkey", "mintRecommendations"]),
     ...mapState(useWalletStore, ["mnemonic"]),
+    ...mapState(useWorkersStore, ["invoiceWorkerRunning"]),
     ...mapWritableState(useMintsStore, [
       "addMintData",
       "showAddMintDialog",
@@ -548,7 +562,14 @@ export default defineComponent({
       }
     },
   },
-  watch: {},
+  watch: {
+    // if swapBlocking is true and invoiceWorkerRunning changes to false, then swapBlocking should be set to false
+    invoiceWorkerRunning: function (val) {
+      if (this.swapBlocking && !val) {
+        this.swapBlocking = false;
+      }
+    },
+  },
   methods: {
     ...mapActions(useNostrStore, [
       "init",
@@ -618,18 +639,28 @@ export default defineComponent({
     },
     //
     mintSwap: async function (from_url, to_url, amount) {
-      // get invoice
-      await this.activateMintUrl(to_url);
-      let invoice = await this.requestMint(amount);
+      if (this.swapBlocking) {
+        notifyWarning("Swap in progress");
+        return;
+      }
+      this.swapBlocking = true;
+      try {
+        // get invoice
+        await this.activateMintUrl(to_url);
+        let invoice = await this.requestMint(amount);
 
-      // pay invoice
-      await this.activateMintUrl(from_url);
-      await this.decodeRequest(invoice.request);
-      await this.melt();
+        // pay invoice
+        await this.activateMintUrl(from_url);
+        await this.decodeRequest(invoice.request);
+        await this.melt();
 
-      // settle invoice on other side
-      await this.activateMintUrl(to_url);
-      await this.invoiceCheckWorker();
+        // settle invoice on other side
+        await this.activateMintUrl(to_url);
+        await this.invoiceCheckWorker();
+      } catch (e) {
+        console.error("Error swapping", e);
+        notifyError("Error swapping");
+      }
     },
     enable_terminal: function () {
       // enable debug terminal
diff --git a/src/components/PayInvoiceDialog.vue b/src/components/PayInvoiceDialog.vue
index 37efae78..f3316f8b 100644
--- a/src/components/PayInvoiceDialog.vue
+++ b/src/components/PayInvoiceDialog.vue
@@ -56,7 +56,7 @@
             :label="!payInvoiceData.blocking ? 'Pay' : 'Processing...'"
             ><q-spinner-hourglass
               v-if="payInvoiceData.blocking"
-              color="white"
+              color="primary"
               size="1em"
           /></q-btn>
           <q-btn v-close-popup flat color="grey" class="q-ml-auto"
diff --git a/src/stores/wallet.ts b/src/stores/wallet.ts
index d8bb9385..39015b7c 100644
--- a/src/stores/wallet.ts
+++ b/src/stores/wallet.ts
@@ -534,7 +534,6 @@ export const useWalletStore = defineStore("wallet", {
       if (this.payInvoiceData.blocking) {
         throw new Error("already processing an invoice.");
       }
-      this.payInvoiceData.blocking = true;
       console.log("#### pay lightning");
       if (this.payInvoiceData.invoice == null) {
         throw new Error("no invoice provided.");
@@ -558,12 +557,13 @@ export const useWalletStore = defineStore("wallet", {
         "amount with fees",
         amount
       );
-      const { keepProofs, sendProofs } = await this.splitToSend(
-        mintStore.activeMint().unitProofs(mintStore.activeUnit),
-        amount
-      );
-      proofsStore.setReserved(sendProofs, true);
+      this.payInvoiceData.blocking = true;
       try {
+        const { keepProofs, sendProofs } = await this.splitToSend(
+          mintStore.activeMint().unitProofs(mintStore.activeUnit),
+          amount
+        );
+        proofsStore.setReserved(sendProofs, true);
         // NUT-08 blank outputs for change
         let n_outputs = Math.max(Math.ceil(Math.log2(quote.fee_reserve)), 1);
         const keysetId = this.getKeyset();
@@ -614,14 +614,14 @@ export const useWalletStore = defineStore("wallet", {
 
         this.payInvoiceData.invoice = { sat: 0, memo: "", bolt11: "" };
         this.payInvoiceData.show = false;
-        this.payInvoiceData.blocking = false;
         return data;
       } catch (error: any) {
-        this.payInvoiceData.blocking = false;
         proofsStore.setReserved(sendProofs, false);
         console.error(error);
         notifyApiError(error);
         throw error;
+      } finally {
+        this.payInvoiceData.blocking = false;
       }
     },
     // /check