1 files changed, 2 insertions, 1 deletions
diff --git a/ui/app/account-detail.js b/ui/app/account-detail.js
index 250e7318c..a876b275f 100644
--- a/ui/app/account-detail.js
+++ b/ui/app/account-detail.js
@@ -13,7 +13,7 @@ function mapStateToProps(state) {
   return {
     identities: state.metamask.identities,
     accounts: state.metamask.accounts,
-    address: state.appState.currentView.context,
+    address: state.metamask.selectedAccount,
     accountDetail: state.appState.accountDetail,
     transactions: state.metamask.transactions,
     networkVersion: state.metamask.network,
@@ -27,6 +27,7 @@ function AccountDetailScreen() {
 
 AccountDetailScreen.prototype.render = function() {
   var state = this.props
+  var selected = state.address || Object.keys(state.accounts[0]).address
   var identity = state.identities[state.address]
   var account = state.accounts[state.address]
   var accountDetail = state.accountDetail