diff --git a/templates/explore/repo_list.tmpl b/templates/explore/repo_list.tmpl
index ab5999832d..ee2fc9c9ad 100644
--- a/templates/explore/repo_list.tmpl
+++ b/templates/explore/repo_list.tmpl
@@ -11,7 +11,7 @@
 						<a class="text primary name" href="{{.Owner.HomeLink}}">{{.Owner.Name}}</a>/
 						{{end}}
 						<a class="text primary name" href="{{.Link}}">{{.Name}}</a>
-						<span class="label-list">
+						<span>
 							{{if .IsArchived}}
 								<span class="ui label">{{ctx.Locale.Tr "repo.desc.archived"}}</span>
 							{{end}}
@@ -56,7 +56,7 @@
 					<div class="flex-item-body">{{$description}}</div>
 				{{end}}
 				{{if .Topics}}
-					<div class="label-list">
+					<div class="repo-topics">
 					{{range .Topics}}
 						{{if ne . ""}}<a class="ui label" href="{{AppSubUrl}}/explore/repos?q={{.}}&topic=1">{{.}}</a>{{end}}
 					{{end}}
diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl
index 39d0c6c751..c87d7d0bf8 100644
--- a/templates/repo/home.tmpl
+++ b/templates/repo/home.tmpl
@@ -11,10 +11,13 @@
 				{{if .Repository.Website}}<a class="link" href="{{.Repository.Website}}">{{.Repository.Website}}</a>{{end}}
 			</div>
 		</div>
-		<div class="tw-flex tw-items-center tw-flex-wrap tw-gap-2 tw-my-2" id="repo-topics">
-			{{/* it should match the code in issue-home.js */}}
-			{{range .Topics}}<a class="repo-topic ui large label" href="{{AppSubUrl}}/explore/repos?q={{.Name}}&topic=1">{{.Name}}</a>{{end}}
-			{{if and .Permission.IsAdmin (not .Repository.IsArchived)}}<button id="manage_topic" class="btn interact-fg tw-text-12">{{ctx.Locale.Tr "repo.topic.manage_topics"}}</button>{{end}}
+		<div class="repo-topics tw-my-2" id="repo-topics">
+			{{range .Topics}}
+				<a class="repo-topic ui large label" href="{{AppSubUrl}}/explore/repos?q={{.Name}}&topic=1">{{.Name}}</a>
+			{{end}}
+			{{if and .Permission.IsAdmin (not .Repository.IsArchived)}}
+				<button id="manage_topic" class="btn interact-fg tw-text-12">{{ctx.Locale.Tr "repo.topic.manage_topics"}}</button>
+			{{end}}
 		</div>
 		{{end}}
 		{{if and .Permission.IsAdmin (not .Repository.IsArchived)}}
diff --git a/web_src/css/repo.css b/web_src/css/repo.css
index 87fca9024a..f9e886e770 100644
--- a/web_src/css/repo.css
+++ b/web_src/css/repo.css
@@ -2329,12 +2329,23 @@ tbody.commit-list {
   top: -2px;
 }
 
-#repo-topics .repo-topic {
+.repo-topics {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  gap: 0.25rem;
+}
+
+.repo-topics .repo-topic {
   font-weight: var(--font-weight-normal);
   cursor: pointer;
   margin: 0;
 }
 
+.repo-topics .repo-topic:last-of-type {
+  margin-right: 0.5rem;
+}
+
 #new-dependency-drop-list.ui.selection.dropdown {
   min-width: 0;
   width: 100%;