2 files changed, 5 insertions, 15 deletions
diff --git a/ui/app/components/send-token/index.js b/ui/app/components/send-token/index.js
index cc77c2699..60fe2ac8b 100644
--- a/ui/app/components/send-token/index.js
+++ b/ui/app/components/send-token/index.js
@@ -181,7 +181,7 @@ SendTokenScreen.prototype.renderToAddressInput = function () {
         to: e.target.value,
         errors: {},
       }),
-      onFocus: () => to && this.setState({ to: '' }),
+      onFocus: event => to && event.target.select(),
     }),
     h('datalist#addresses', [
       // Corresponds to the addresses owned.
diff --git a/ui/app/send.js b/ui/app/send.js
index 8fab8a384..ac1ee0d84 100644
--- a/ui/app/send.js
+++ b/ui/app/send.js
@@ -123,14 +123,9 @@ SendTransactionScreen.prototype.renderFromInput = function (from, identities) {
         })
       },
       onBlur: () => this.setErrorsFor('from'),
-      onFocus: () => {
+      onFocus: event => {
         this.clearErrorsFor('from'),
-        this.state.newTx.from && this.setState({
-          newTx: {
-            ...this.state.newTx,
-            from: '',
-          },
-        })
+        this.state.newTx.from && event.target.select()
       },
     }),
 
@@ -168,14 +163,9 @@ SendTransactionScreen.prototype.renderToInput = function (to, identities, addres
         })
       },
       onBlur: () => this.setErrorsFor('to'),
-      onFocus: () => {
+      onFocus: event => {
         this.clearErrorsFor('to')
-        this.state.newTx.to && this.setState({
-          newTx: {
-            ...this.state.newTx,
-            to: '',
-          },
-        })
+        this.state.newTx.to && event.target.select()
       },
     }),