diff --git a/app/src/main/java/to/bitkit/ui/sheets/NewTransactionSheet.kt b/app/src/main/java/to/bitkit/ui/sheets/NewTransactionSheet.kt
index 9011baef7..b8b11c878 100644
--- a/app/src/main/java/to/bitkit/ui/sheets/NewTransactionSheet.kt
+++ b/app/src/main/java/to/bitkit/ui/sheets/NewTransactionSheet.kt
@@ -174,8 +174,7 @@ fun NewTransactionSheetView(
                     SecondaryButton(
                         text = stringResource(R.string.wallet__send_details),
                         onClick = onDetailClick,
-                        enabled = details.paymentHashOrTxId != null,
-                        isLoading = details.isLoadingDetails,
+                        enabled = details.paymentHashOrTxId != null && !details.isLoadingDetails,
                         modifier = Modifier
                             .weight(1f)
                             .testTag("Details")
diff --git a/app/src/main/java/to/bitkit/viewmodels/AppViewModel.kt b/app/src/main/java/to/bitkit/viewmodels/AppViewModel.kt
index 814bee504..47f8d7f36 100644
--- a/app/src/main/java/to/bitkit/viewmodels/AppViewModel.kt
+++ b/app/src/main/java/to/bitkit/viewmodels/AppViewModel.kt
@@ -1591,10 +1591,12 @@ class AppViewModel @Inject constructor(
                                 direction = NewTransactionSheetDirection.SENT,
                                 paymentHashOrTxId = txId,
                                 sats = amount.toLong(),
+                                isLoadingDetails = true,
                             )
                         )
                         lightningRepo.sync()
                         activityRepo.syncActivities()
+                        _successSendUiState.update { it.copy(isLoadingDetails = false) }
                     }.onFailure { e ->
                         Logger.error(msg = "Error sending onchain payment", e = e, context = TAG)
                         toast(