diff --git a/lib/pages/wallet_view/sub_widgets/transactions_list.dart b/lib/pages/wallet_view/sub_widgets/transactions_list.dart
index 39d9dfc7a..71f56ccad 100644
--- a/lib/pages/wallet_view/sub_widgets/transactions_list.dart
+++ b/lib/pages/wallet_view/sub_widgets/transactions_list.dart
@@ -85,13 +85,16 @@ class _TransactionsListState extends ConsumerState<TransactionsList> {
           children: [
             TransactionCard(
               // this may mess with combined firo transactions
-              key: Key(tx.toString()), //
+              key: Key(tx.txid + tx.type.name + tx.address.value.toString()), //
               transaction: tx,
               walletId: widget.walletId,
             ),
             TradeCard(
               // this may mess with combined firo transactions
-              key: Key(tx.toString() + trade.uuid), //
+              key: Key(tx.txid +
+                  tx.type.name +
+                  tx.address.value.toString() +
+                  trade.uuid), //
               trade: trade,
               onTap: () async {
                 if (Util.isDesktop) {
@@ -177,7 +180,7 @@ class _TransactionsListState extends ConsumerState<TransactionsList> {
         ),
         child: TransactionCard(
           // this may mess with combined firo transactions
-          key: Key(tx.toString()), //
+          key: Key(tx.txid + tx.type.name + tx.address.value.toString()), //
           transaction: tx,
           walletId: widget.walletId,
         ),