diff --git a/src/status_im/ui/screens/wallet/send/events.cljs b/src/status_im/ui/screens/wallet/send/events.cljs
index 1f3a4a8891..6d45e27253 100644
--- a/src/status_im/ui/screens/wallet/send/events.cljs
+++ b/src/status_im/ui/screens/wallet/send/events.cljs
@@ -91,7 +91,8 @@
                                       :signing?        false
                                       :wrong-password? false
                                       :waiting-signal? false
-                                      :from-chat?      false})
+                                      :from-chat?      false
+                                      :password        nil})
 
 (defn on-transactions-completed [raw-results]
   (let [results (:results (types/json->clj raw-results))]
@@ -290,7 +291,8 @@
   (fn [{:keys [db]} _]
     {:db (update-in db [:wallet :send-transaction] assoc
                     :signing? false
-                    :wrong-password? false)}))
+                    :wrong-password? false
+                    :password nil)}))
 
 (handlers/register-handler-fx
   :wallet.send/set-password
diff --git a/src/status_im/ui/screens/wallet/send/views.cljs b/src/status_im/ui/screens/wallet/send/views.cljs
index 4ef83e3e3c..2d7f5da83b 100644
--- a/src/status_im/ui/screens/wallet/send/views.cljs
+++ b/src/status_im/ui/screens/wallet/send/views.cljs
@@ -71,6 +71,7 @@
       (i18n/label :t/cancel)]
      [button/button {:style               (wallet.styles/button-container sign-enabled?)
                      :on-press            sign-handler
+                     :disabled?           (not sign-enabled?)
                      :accessibility-label :sign-transaction-button}
       (i18n/label (or sign-label :t/transactions-sign-transaction))
       [vector-icons/icon :icons/forward {:color :white}]]]))