diff --git a/ui/app/account-detail.js b/ui/app/account-detail.js
index 22a883096..f6041e856 100644
--- a/ui/app/account-detail.js
+++ b/ui/app/account-detail.js
@@ -107,14 +107,23 @@ AccountDetailScreen.prototype.render = function () {
                 },
                 [
                   h(
-                    'h2.font-medium.color-forest',
+                    'div.font-medium.color-forest',
                     {
                       name: 'edit',
                       style: {
                       },
                     },
                     [
-                      identity && identity.name,
+                      h('h2', {
+                        style: {
+                          maxWidth: '180px',
+                          overflowX: 'hidden',
+                          textOverflow: 'ellipsis',
+                          padding: '5px 0px',
+                        },
+                      }, [
+                        identity && identity.name,
+                      ]),
                     ]
                   ),
                   h(
diff --git a/ui/app/app.js b/ui/app/app.js
index 4565bdd37..1f3d5b0f8 100644
--- a/ui/app/app.js
+++ b/ui/app/app.js
@@ -185,7 +185,7 @@ App.prototype.renderAppBar = function () {
             style: {},
             enableAccountsSelector: true,
             identities: this.props.identities,
-            selected: this.props.selected,
+            selected: this.props.currentView.context,
             network: this.props.network,
           }, []),
 
diff --git a/ui/app/components/account-dropdowns.js b/ui/app/components/account-dropdowns.js
index b23600e9b..7c24e70bd 100644
--- a/ui/app/components/account-dropdowns.js
+++ b/ui/app/components/account-dropdowns.js
@@ -51,7 +51,16 @@ class AccountDropdowns extends Component {
               },
             },
           ),
-          h('span', { style: { marginLeft: '20px', fontSize: '24px' } }, identity.name || ''),
+          h('span', {
+            style: {
+              marginLeft: '20px',
+              fontSize: '24px',
+              maxWidth: '145px',
+              whiteSpace: 'nowrap',
+              overflow: 'hidden',
+              textOverflow: 'ellipsis',
+            },
+          }, identity.name || ''),
           h('span', { style: { marginLeft: '20px', fontSize: '24px' } }, isSelected ? h('.check', '✓') : null),
         ]
       )