1 files changed, 4 insertions, 12 deletions
diff --git a/ui/app/components/send/to-autocomplete.js b/ui/app/components/send/to-autocomplete.js
index 081b85ab7..ab490155b 100644
--- a/ui/app/components/send/to-autocomplete.js
+++ b/ui/app/components/send/to-autocomplete.js
@@ -62,26 +62,18 @@ ToAutoComplete.prototype.handleInputEvent = function (event = {}, cb) {
     openDropdown,
   } = this.props
 
-  const matchingAccounts = accounts.filter(({ address }) => address.match(to))
+  const matchingAccounts = accounts.filter(({ address }) => address.match(to || ''))
+  const matches = matchingAccounts.length
 
-  if (!to) {
-    this.setState({ accountsToRender: accounts })
-    openDropdown()
-  }
-  else if (matchingAccounts.length === 1 && matchingAccounts[0].address === to) {
+  if (!matches || matchingAccounts[0].address === to) {
     this.setState({ accountsToRender: [] })
     event.target && event.target.select()
     closeDropdown()
   }
-  else if (matchingAccounts.length) {
+  else {
     this.setState({ accountsToRender: matchingAccounts })
     openDropdown()
   }
-  else {
-    this.setState({ accountsToRender: [] })
-    event.target && event.target.select()
-    closeDropdown()
-  }
   cb && cb(event.target.value)
 }