diff --git a/templates/org/header.tmpl b/templates/org/header.tmpl
index 72adf6d9b..7b912c1c5 100644
--- a/templates/org/header.tmpl
+++ b/templates/org/header.tmpl
@@ -2,7 +2,7 @@
 	<div class="ui container">
 		<div class="ui vertically grid head">
 			<div class="column">
-				<div class="ui header">
+				<div class="ui header gt-df gt-ac gt-word-break">
 					{{ctx.AvatarUtils.Avatar . 100}}
 					<span class="text thin grey"><a href="{{.HomeLink}}">{{.DisplayName}}</a></span>
 					<span class="org-visibility">
diff --git a/templates/org/home.tmpl b/templates/org/home.tmpl
index ff4f3a8b1..ee3237d45 100644
--- a/templates/org/home.tmpl
+++ b/templates/org/home.tmpl
@@ -3,7 +3,7 @@
 	<div class="ui container gt-df">
 		{{ctx.AvatarUtils.Avatar .Org 140 "org-avatar"}}
 		<div id="org-info">
-			<div class="ui header gt-df gt-fw">
+			<div class="ui header">
 				{{.Org.DisplayName}}
 				<span class="org-visibility">
 					{{if .Org.Visibility.IsLimited}}<span class="ui large basic horizontal label">{{ctx.Locale.Tr "org.settings.visibility.limited_shortname"}}</span>{{end}}
diff --git a/templates/shared/user/org_profile_avatar.tmpl b/templates/shared/user/org_profile_avatar.tmpl
index b9ade23d0..a8846b0ab 100644
--- a/templates/shared/user/org_profile_avatar.tmpl
+++ b/templates/shared/user/org_profile_avatar.tmpl
@@ -2,7 +2,7 @@
 	<div class="ui container">
 		<div class="ui vertically grid head">
 			<div class="column">
-				<div class="ui header">
+				<div class="ui header gt-df gt-ac gt-word-break">
 					{{ctx.AvatarUtils.Avatar . 100}}
 					<span class="text thin grey"><a href="{{.HomeLink}}">{{.DisplayName}}</a></span>
 					<span class="org-visibility">
diff --git a/web_src/css/base.css b/web_src/css/base.css
index 0cfd31115..ae8eb0570 100644
--- a/web_src/css/base.css
+++ b/web_src/css/base.css
@@ -1411,6 +1411,7 @@ img.ui.avatar,
 .ui.label {
   padding: 0.3em 0.5em;
   transition: none;
+  white-space: nowrap;
 }
 
 .ui.label,
diff --git a/web_src/css/org.css b/web_src/css/org.css
index 061d30bef..d2bf0ff60 100644
--- a/web_src/css/org.css
+++ b/web_src/css/org.css
@@ -102,6 +102,7 @@
 .organization.profile #org-info {
   overflow-wrap: anywhere;
   flex: 1;
+  word-break: break-all;
 }
 
 .organization.profile #org-info .ui.header {
diff --git a/web_src/css/repo.css b/web_src/css/repo.css
index 7d76dd8b3..5b532aa49 100644
--- a/web_src/css/repo.css
+++ b/web_src/css/repo.css
@@ -2606,6 +2606,7 @@ tbody.commit-list {
   justify-content: space-between;
   flex-wrap: wrap;
   word-break: break-word;
+  gap: 0.5rem;
 }
 
 @media (max-width: 767.98px) {