diff --git a/templates/explore/repo_list.tmpl b/templates/explore/repo_list.tmpl
index 6650e6073f..288313c7d4 100644
--- a/templates/explore/repo_list.tmpl
+++ b/templates/explore/repo_list.tmpl
@@ -10,7 +10,7 @@
 					<a class="name" href="{{.Link}}">
 						{{if or $.PageIsExplore $.PageIsProfileStarList}}{{if .Owner}}{{.Owner.Name}} / {{end}}{{end}}{{.Name}}
 					</a>
-					<div class="labels gt-df gt-ac gt-fw">
+					<div class="labels gt-df gt-ac gt-fw gt-mr-3">
 						{{if .IsArchived}}
 							<span class="ui basic label">{{$.locale.Tr "repo.desc.archived"}}</span>
 						{{end}}
diff --git a/templates/repo/pulls/fork.tmpl b/templates/repo/pulls/fork.tmpl
index 930d5afa69..34adc7b2f1 100644
--- a/templates/repo/pulls/fork.tmpl
+++ b/templates/repo/pulls/fork.tmpl
@@ -37,7 +37,7 @@
 
 					<div class="inline field">
 						<label>{{.locale.Tr "repo.fork_from"}}</label>
-						<a href="{{.ForkRepo.Link}}">{{.ForkRepo.FullName}}</a>
+						<a href="{{.ForkRepo.Link}}" class="gt-dib">{{.ForkRepo.FullName}}</a>
 					</div>
 					<div class="inline required field {{if .Err_RepoName}}error{{end}}">
 						<label for="repo_name">{{.locale.Tr "repo.repo_name"}}</label>
diff --git a/web_src/css/explore.css b/web_src/css/explore.css
index 8543702252..e3f9dddc58 100644
--- a/web_src/css/explore.css
+++ b/web_src/css/explore.css
@@ -41,6 +41,11 @@
   margin-bottom: 0.5rem;
 }
 
+.ui.repository.list .repo-title .labels {
+  word-break: normal;
+  flex-shrink: 0;
+}
+
 .ui.repository.branches .info {
   font-size: 12px;
   color: var(--color-text-light);
diff --git a/web_src/css/form.css b/web_src/css/form.css
index e325a377f8..324a210f4f 100644
--- a/web_src/css/form.css
+++ b/web_src/css/form.css
@@ -479,7 +479,8 @@ textarea:focus,
 
 .repository.new.repo form .selection.dropdown,
 .repository.new.migrate form .selection.dropdown,
-.repository.new.fork form .selection.dropdown {
+.repository.new.fork form .selection.dropdown,
+.repository.new.fork form .field a {
   vertical-align: middle;
   width: 50% !important;
 }
@@ -491,6 +492,7 @@ textarea:focus,
   .repository.new.repo form input,
   .repository.new.migrate form input,
   .repository.new.fork form input,
+  .repository.new.fork form .field a,
   .repository.new.repo form .selection.dropdown,
   .repository.new.migrate form .selection.dropdown,
   .repository.new.fork form .selection.dropdown {
@@ -500,8 +502,7 @@ textarea:focus,
   .repository.new.migrate form .field button,
   .repository.new.fork form .field button,
   .repository.new.repo form .field a,
-  .repository.new.migrate form .field a,
-  .repository.new.fork form .field a {
+  .repository.new.migrate form .field a {
     margin-bottom: 1em;
     width: 100%;
   }
diff --git a/web_src/css/repository.css b/web_src/css/repository.css
index d2040ec0ac..2708cf4d47 100644
--- a/web_src/css/repository.css
+++ b/web_src/css/repository.css
@@ -214,6 +214,10 @@
   font-size: 1.2em;
 }
 
+.repository.file.list .repo-path {
+  word-break: break-word;
+}
+
 .repository.file.list .repo-path .section,
 .repository.file.list .repo-path .divider {
   display: inline;
diff --git a/web_src/css/user.css b/web_src/css/user.css
index adf865496b..a3379440df 100644
--- a/web_src/css/user.css
+++ b/web_src/css/user.css
@@ -67,6 +67,11 @@
   margin-top: 25px;
 }
 
+.user.profile .ui.repository.list .repo-title .labels {
+  word-break: normal;
+  flex-shrink: 0;
+}
+
 .user.profile #loading-heatmap {
   margin-bottom: 1em;
 }