diff --git a/templates/repo/description.tmpl b/templates/repo/description.tmpl
index 263bd96a2a..e015a74517 100644
--- a/templates/repo/description.tmpl
+++ b/templates/repo/description.tmpl
@@ -9,14 +9,17 @@
 	    </div>
     </div>
 
-    <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>
+		{{$canManageTopics := and .Permission.IsAdmin (not .Repository.IsArchived)}}
+		{{if or $canManageTopics .Topics}}
+			<div class="repo-topics tw-mt-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 $canManageTopics}}
+					<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)}}
-			<button id="manage_topic" class="btn interact-fg tw-text-12">{{ctx.Locale.Tr "repo.topic.manage_topics"}}</button>
-		{{end}}
-	</div>
 
     {{if and .Permission.IsAdmin (not .Repository.IsArchived)}}
         <div class="ui form tw-hidden tw-flex tw-gap-2 tw-my-3" id="topic_edit">
@@ -34,4 +37,4 @@
 		    </div>
 	    </div>
     {{end}}
-</div>
\ No newline at end of file
+</div>