Merge branch 'NewUI-flat' into MM-57-use-gas-estimator

1 files changed, 4 insertions, 1 deletions

diff --git a/ui/app/components/send-token/index.js b/ui/app/components/send-token/index.js
index e4f13a874..379f63883 100644
--- a/ui/app/components/send-token/index.js
+++ b/ui/app/components/send-token/index.js
@@ -240,7 +240,10 @@ SendTokenScreen.prototype.renderToAddressInput = function () {
         this.setErrorsFor('to')
         this.estimateGasAndPrice()
       },
-      onFocus: () => this.clearErrorsFor('to'),
+      onFocus: event => {
+        if (to) event.target.select()
+        this.clearErrorsFor('to')
+      },
     }),
     h('datalist#addresses', [
       // Corresponds to the addresses owned.