diff --git a/src/status_im/chat/events.cljs b/src/status_im/chat/events.cljs
index 3acc7fd331..4c0978d9fe 100644
--- a/src/status_im/chat/events.cljs
+++ b/src/status_im/chat/events.cljs
@@ -302,7 +302,7 @@
  (fn [cofx [_ chat-id]]
    (handlers-macro/merge-fx cofx
                             (events.commands/execute-stored-command)
-                            (navigate-to-chat chat-id {}))))
+                            (navigate-to-chat chat-id {:navigation-replace? true}))))
 
 (defn start-chat
   "Start a chat, making sure it exists"
diff --git a/src/status_im/chat/events/shortcuts.cljs b/src/status_im/chat/events/shortcuts.cljs
index 60b493c265..bad811e704 100644
--- a/src/status_im/chat/events/shortcuts.cljs
+++ b/src/status_im/chat/events/shortcuts.cljs
@@ -16,6 +16,7 @@
   (merge {:db (-> db
                   (send.events/set-and-validate-amount-db (:amount params) :ETH 18)
                   (choose-recipient.events/fill-request-details (transaction-details contact))
+                  (update-in [:wallet :send-transaction] dissoc :id :password :wrong-password?)
                   (navigation/navigate-to
                    (if (:wallet-set-up-passed? account)
                      :wallet-send-transaction-chat