diff --git a/submodules/WalletUI/Sources/WalletSendScreen.swift b/submodules/WalletUI/Sources/WalletSendScreen.swift
index 69e4996518..b46dc0152a 100644
--- a/submodules/WalletUI/Sources/WalletSendScreen.swift
+++ b/submodules/WalletUI/Sources/WalletSendScreen.swift
@@ -336,9 +336,9 @@ public func walletSendScreen(context: WalletContext, randomId: Int64, walletInfo
                 popImpl?()
                 if let updatedState = updatedState {
                     if updatedState.amount.isEmpty {
-                        selectNextInputItemImpl?(WalletSendScreenEntryTag.address)
-                    } else if updatedState.comment.isEmpty {
                         selectNextInputItemImpl?(WalletSendScreenEntryTag.amount)
+                    } else if updatedState.comment.isEmpty {
+                        selectNextInputItemImpl?(WalletSendScreenEntryTag.comment)
                     }
                 }
             }))