diff --git a/packages/extension-ui/src/Popup/Accounts/Account.tsx b/packages/extension-ui/src/Popup/Accounts/Account.tsx
index 8023668b5bf..39537487792 100644
--- a/packages/extension-ui/src/Popup/Accounts/Account.tsx
+++ b/packages/extension-ui/src/Popup/Accounts/Account.tsx
@@ -83,10 +83,12 @@ export default styled(Account)`
   ${Address} {
     margin-bottom: 8px;
   }
-  
+
   .edit-name {
     position: absolute;
-    left: 73px;
-    top: 8px;
+    flex: 1;
+    left: 80px;
+    top: 6px;
+    width: 315px;
   }
 `;
diff --git a/packages/extension-ui/src/components/Address.tsx b/packages/extension-ui/src/components/Address.tsx
index 6465c8197fa..5513b8bb91e 100644
--- a/packages/extension-ui/src/components/Address.tsx
+++ b/packages/extension-ui/src/components/Address.tsx
@@ -96,8 +96,8 @@ function Address ({ address, className, children, genesisHash, name, actions }:
             </>
           )}
         </AccountInfoRow>
-        {children}
       </div>
+      {children}
     </div>
   );
 }
@@ -119,6 +119,9 @@ const Info = styled.div`
 `;
 
 const Name = styled.div`
+  overflow: hidden;
+  text-overflow: ellipsis;
+  width: 300px;
   margin: 2px 0;
   font-weight: 600;
   font-size: 16px;
@@ -126,7 +129,7 @@ const Name = styled.div`
 `;
 
 const FullAddress = styled.div`
-  width: 250px;
+  width: 300px;
   overflow: hidden;
   text-overflow: ellipsis;
   color: ${({ theme }): string => theme.labelColor};