diff --git a/packages/client/src/components/MkNoteDetailed.vue b/packages/client/src/components/MkNoteDetailed.vue
index 82468027fd..0ba93bbd76 100644
--- a/packages/client/src/components/MkNoteDetailed.vue
+++ b/packages/client/src/components/MkNoteDetailed.vue
@@ -35,7 +35,7 @@
 			<div class="body">
 				<div class="top">
 					<MkA v-user-preview="appearNote.user.id" class="name" :to="userPage(appearNote.user)">
-						<MkUserName :user="appearNote.user"/>
+						<MkUserName :nowrap="false" :user="appearNote.user"/>
 					</MkA>
 					<span v-if="appearNote.user.isBot" class="is-bot">bot</span>
 					<div class="info">
@@ -397,6 +397,7 @@ if (appearNote.replyId) {
 			display: flex;
 			position: relative;
 			margin-bottom: 16px;
+			align-items: center;
 
 			> .avatar {
 				display: block;
@@ -416,14 +417,15 @@ if (appearNote.replyId) {
 				> .top {
 					> .name {
 						font-weight: bold;
+						line-height: 1.3;
 					}
 
 					> .is-bot {
-						flex-shrink: 0;
-						align-self: center;
+						display: inline-block;
 						margin: 0 0.5em;
 						padding: 4px 6px;
 						font-size: 80%;
+						line-height: 1;
 						border: solid 0.5px var(--divider);
 						border-radius: 4px;
 					}
@@ -432,6 +434,12 @@ if (appearNote.replyId) {
 						float: right;
 					}
 				}
+
+				> .username {
+					margin-bottom: 2px;
+					line-height: 1.3;
+					word-wrap: anywhere;
+				}
 			}
 		}