diff --git a/lib/features/add_transaction/screen.dart b/lib/features/add_transaction/screen.dart
index 4557d4a..5313aa1 100644
--- a/lib/features/add_transaction/screen.dart
+++ b/lib/features/add_transaction/screen.dart
@@ -993,7 +993,8 @@ class _ToAccountDropdownOverlay extends ConsumerWidget {
               return Column(
                 mainAxisSize: MainAxisSize.min,
                 children: filteredAccounts.map((account) {
-                  final isSelected = account.id == toAccountId;
+                  final isSelected =
+                      toAccountId != null && account.id == toAccountId;
                   return InkWell(
                     borderRadius: BorderRadius.circular(12),
                     onTap: () {
diff --git a/lib/features/add_transaction/widgets/account_selector.dart b/lib/features/add_transaction/widgets/account_selector.dart
index d4513e5..8598384 100644
--- a/lib/features/add_transaction/widgets/account_selector.dart
+++ b/lib/features/add_transaction/widgets/account_selector.dart
@@ -132,7 +132,6 @@ class AccountDropdownOverlay extends ConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    final activeAccount = ref.watch(activeAccountProvider);
     final accountsAsync = ref.watch(accountsProvider);
 
     // Calculate position from trigger key
@@ -190,28 +189,12 @@ class AccountDropdownOverlay extends ConsumerWidget {
               final txAccountId = ref
                   .read(addTransactionProvider(initial))
                   .selectedAccountId;
-              final Account displayAccount;
-              if (txAccountId != null) {
-                displayAccount = accounts.firstWhere(
-                  (a) => a.id == txAccountId,
-                  orElse: () => accounts.firstWhere(
-                    (a) => a.isMain,
-                    orElse: () => accounts.first,
-                  ),
-                );
-              } else {
-                displayAccount =
-                    activeAccount ??
-                    accounts.firstWhere(
-                      (a) => a.isMain,
-                      orElse: () => accounts.first,
-                    );
-              }
 
               return Column(
                 mainAxisSize: MainAxisSize.min,
                 children: accounts.map((account) {
-                  final isSelected = account.id == displayAccount.id;
+                  final isSelected =
+                      txAccountId != null && account.id == txAccountId;
                   return InkWell(
                     borderRadius: BorderRadius.circular(12),
                     onTap: () {
diff --git a/lib/features/add_transaction/widgets/submit_button.dart b/lib/features/add_transaction/widgets/submit_button.dart
index 8cf57b3..eff5be7 100644
--- a/lib/features/add_transaction/widgets/submit_button.dart
+++ b/lib/features/add_transaction/widgets/submit_button.dart
@@ -23,7 +23,7 @@ class SubmitButton extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final typeColor = type == TransactionType.transfer
-        ? AppColors.accent
+        ? Colors.blueAccent
         : type == TransactionType.income
         ? const Color(0xFF4CAF8C)
         : const Color(0xFFE05C6B);