diff --git a/ui/app/AppLayouts/Wallet/stores/RootStore.qml b/ui/app/AppLayouts/Wallet/stores/RootStore.qml
index 39fa69756b..9bfeb07bc8 100644
--- a/ui/app/AppLayouts/Wallet/stores/RootStore.qml
+++ b/ui/app/AppLayouts/Wallet/stores/RootStore.qml
@@ -328,7 +328,7 @@ QtObject {
             return false
 
         let res = SQUtils.ModelUtils.getByKey(root.accounts, "address", tx.sender)
-        if (!res || res.object.walletType === Constants.watchWalletType)
+        if (!res || res.walletType === Constants.watchWalletType)
             return false
 
         if (tx.isNFT) {
diff --git a/ui/imports/shared/popups/send/SendModal.qml b/ui/imports/shared/popups/send/SendModal.qml
index 8f3920f919..2d7b6a7091 100644
--- a/ui/imports/shared/popups/send/SendModal.qml
+++ b/ui/imports/shared/popups/send/SendModal.qml
@@ -230,7 +230,6 @@ StatusDialog {
                 holdingSelector.currentTab = TokenSelectorPanel.Tabs.Collectibles
             }
         }
-
         if(!!popup.preDefinedAmountToSend) {
             // TODO: At this stage the number should not be localized. However
             // in many places when initializing popup the number is provided
diff --git a/ui/imports/shared/views/HistoryView.qml b/ui/imports/shared/views/HistoryView.qml
index c02ee984e4..7ad8c05791 100644
--- a/ui/imports/shared/views/HistoryView.qml
+++ b/ui/imports/shared/views/HistoryView.qml
@@ -311,7 +311,7 @@ ColumnLayout {
                 if (!overview.isWatchOnlyAccount && !tx)
                     return false
                 return WalletStores.RootStore.isTxRepeatable(tx)
-            }
+        }
 
             onTriggered: {
                 if (!tx)
@@ -326,11 +326,10 @@ ColumnLayout {
                                                               tx.isNFT,
                                                               tx.amount)
 
-                root.sendModal.preSelectedAccount = req.preSelectedAccount
+                root.sendModal.preSelectedAccountAddress = req.preSelectedAccount.address
                 root.sendModal.preSelectedRecipient = req.preSelectedRecipient
                 root.sendModal.preSelectedRecipientType = req.preSelectedRecipientType
-                root.sendModal.preSelectedHolding = req.preSelectedHolding
-                root.sendModal.preSelectedHoldingID = req.preSelectedHoldingID
+                root.sendModal.preSelectedHoldingID = req.preSelectedHoldingID ?? req.preSelectedHolding.uid
                 root.sendModal.preSelectedHoldingType = req.preSelectedHoldingType
                 root.sendModal.preSelectedSendType = req.preSelectedSendType
                 root.sendModal.preDefinedAmountToSend = req.preDefinedAmountToSend