diff --git a/src/pages/accounts.jsx b/src/pages/accounts.jsx
index 72ac0d87..4873da23 100644
--- a/src/pages/accounts.jsx
+++ b/src/pages/accounts.jsx
@@ -63,7 +63,16 @@ function Accounts({ onClose }) {
                       }}
                     />
                     <NameText
-                      account={account.info}
+                      account={
+                        moreThanOneAccount
+                          ? {
+                              ...account.info,
+                              acct: /@/.test(account.info.acct)
+                                ? account.info.acct
+                                : `${account.info.acct}@${account.instanceURL}`,
+                            }
+                          : account.info
+                      }
                       showAcct
                       onClick={() => {
                         if (isCurrent) {
diff --git a/src/pages/settings.css b/src/pages/settings.css
index c5285a10..9da34e8b 100644
--- a/src/pages/settings.css
+++ b/src/pages/settings.css
@@ -31,7 +31,7 @@
   display: flex;
   justify-content: space-between;
   align-items: center;
-  flex-wrap: wrap;
+  /* flex-wrap: wrap; */
   border-bottom: var(--hairline-width) solid var(--outline-color);
 }
 #settings-container section > ul > li .current {
@@ -49,8 +49,8 @@
   vertical-align: middle;
 }
 #settings-container section > ul > li > div {
-  flex-grow: 1;
-  max-width: 100%;
+  display: flex;
+  align-items: center;
 }
 #settings-container section > ul > li > div.actions {
   flex-basis: fit-content;