diff --git a/gui/src/app/state/spend/step.rs b/gui/src/app/state/spend/step.rs
index c2981d48..64b71909 100644
--- a/gui/src/app/state/spend/step.rs
+++ b/gui/src/app/state/spend/step.rs
@@ -5,9 +5,7 @@ use std::sync::Arc;
 use iced::{Command, Element};
 use liana::{
     config::Config as DaemonConfig,
-    miniscript::bitcoin::{
-        self, util::psbt::Psbt, Address, Amount, Denomination, OutPoint, Script,
-    },
+    miniscript::bitcoin::{self, util::psbt::Psbt, Address, Amount, Denomination, OutPoint},
 };
 
 use crate::{
@@ -416,26 +414,9 @@ impl SaveSpend {
 
 impl Step for SaveSpend {
     fn load(&mut self, draft: &TransactionDraft) {
-        let outputs_script_pubkeys: Vec<Script> = draft
-            .outputs
-            .keys()
-            .map(|addr| addr.script_pubkey())
-            .collect();
-        let index = if let Some(psbt) = &draft.generated {
-            psbt.unsigned_tx
-                .output
-                .iter()
-                .position(|output| !outputs_script_pubkeys.contains(&output.script_pubkey))
-        } else {
-            None
-        };
         self.spend = Some(detail::SpendTxState::new(
             self.config.clone(),
-            SpendTx::new(
-                draft.generated.clone().unwrap(),
-                index,
-                draft.inputs.clone(),
-            ),
+            SpendTx::new(draft.generated.clone().unwrap(), draft.inputs.clone()),
             false,
         ));
     }
diff --git a/gui/src/app/view/spend/detail.rs b/gui/src/app/view/spend/detail.rs
index 740ad8e0..b1b342ac 100644
--- a/gui/src/app/view/spend/detail.rs
+++ b/gui/src/app/view/spend/detail.rs
@@ -44,7 +44,7 @@ pub fn spend_view<'a, T: Into<Element<'a, Message>>>(
                 &tx.coins,
                 &tx.psbt.unsigned_tx,
                 network,
-                tx.change_index.map(|i| vec![i]),
+                Some(tx.change_indexes.clone()),
                 None,
             )),
     )
diff --git a/gui/src/daemon/mod.rs b/gui/src/daemon/mod.rs
index e8910c96..af9ebd2b 100644
--- a/gui/src/daemon/mod.rs
+++ b/gui/src/daemon/mod.rs
@@ -88,7 +88,7 @@ pub trait Daemon: Debug {
                     })
                     .copied()
                     .collect();
-                model::SpendTx::new(tx.psbt, tx.change_index.map(|i| i as usize), coins)
+                model::SpendTx::new(tx.psbt, coins)
             })
             .collect())
     }
diff --git a/gui/src/daemon/model.rs b/gui/src/daemon/model.rs
index f4ef62fc..d64230fe 100644
--- a/gui/src/daemon/model.rs
+++ b/gui/src/daemon/model.rs
@@ -24,7 +24,7 @@ pub fn remaining_sequence(coin: &Coin, blockheight: u32, timelock: u32) -> u32 {
 pub struct SpendTx {
     pub coins: Vec<Coin>,
     pub psbt: Psbt,
-    pub change_index: Option<usize>,
+    pub change_indexes: Vec<usize>,
     pub spend_amount: Amount,
     pub fee_amount: Amount,
     pub status: SpendStatus,
@@ -38,11 +38,13 @@ pub enum SpendStatus {
 }
 
 impl SpendTx {
-    pub fn new(psbt: Psbt, change_index: Option<usize>, coins: Vec<Coin>) -> Self {
+    pub fn new(psbt: Psbt, coins: Vec<Coin>) -> Self {
+        let mut change_indexes = Vec::new();
         let (change_amount, spend_amount) = psbt.unsigned_tx.output.iter().enumerate().fold(
             (Amount::from_sat(0), Amount::from_sat(0)),
             |(change, spend), (i, output)| {
-                if Some(i) == change_index {
+                if !psbt.outputs[i].bip32_derivation.is_empty() {
+                    change_indexes.push(i);
                     (change + Amount::from_sat(output.value), spend)
                 } else {
                     (change, spend + Amount::from_sat(output.value))
@@ -66,7 +68,7 @@ impl SpendTx {
         Self {
             coins,
             psbt,
-            change_index,
+            change_indexes,
             spend_amount,
             fee_amount: inputs_amount - spend_amount - change_amount,
             status,