1 files changed, 3 insertions, 4 deletions
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 2f114e9f0..7d3f4c2a8 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -628,17 +628,16 @@ module.exports = class MetamaskController extends EventEmitter {
     const oldAccounts = await keyringController.getAccounts()
     const keyState = await keyringController.addNewAccount(keyring)
     const newAccounts = await keyringController.getAccounts()
-    // Assuming the trezor account is the last one
-    const trezorAccount = newAccounts[newAccounts.length - 1]
     this.preferencesController.setAddresses(newAccounts)
+    console.log('new vs old', newAccounts, oldAccounts)
     newAccounts.forEach(address => {
       if (!oldAccounts.includes(address)) {
+        console.log('new address found', address)
+        this.preferencesController.setAccountLabel(address, `TREZOR #${parseInt(index, 10) + 1}`)
         this.preferencesController.setSelectedAddress(address)
       }
     })
 
-    this.preferencesController.setAccountLabel(trezorAccount, `TREZOR #${parseInt(index, 10) + 1}`)
-    this.preferencesController.setSelectedAddress(trezorAccount)
     const { identities } = this.preferencesController.store.getState()
     return { ...keyState, identities }
    }