diff --git a/routers/web/repo/view.go b/routers/web/repo/view.go
index de508509dc..58d2b09ee7 100644
--- a/routers/web/repo/view.go
+++ b/routers/web/repo/view.go
@@ -973,6 +973,9 @@ func renderHomeCode(ctx *context.Context) {
 	ctx.Data["RepositoryUploadEnabled"] = setting.Repository.Upload.Enabled
 	prepareOpenWithEditorApps(ctx)
 
+	// Get Topics of this repo. Earlier, beacuse we show them even when the repo is empty.
+	renderRepoTopics(ctx)
+
 	if ctx.Repo.Commit == nil || ctx.Repo.Repository.IsEmpty || ctx.Repo.Repository.IsBroken() {
 		showEmpty := true
 		var err error
@@ -1021,8 +1024,6 @@ func renderHomeCode(ctx *context.Context) {
 	}
 	ctx.Data["Title"] = title
 
-	// Get Topics of this repo
-	renderRepoTopics(ctx)
 	if ctx.Written() {
 		return
 	}
diff --git a/templates/repo/description.tmpl b/templates/repo/description.tmpl
new file mode 100644
index 0000000000..b6f6e74fbc
--- /dev/null
+++ b/templates/repo/description.tmpl
@@ -0,0 +1,36 @@
+<div class="tw-mb-4"> {{/* Magic number warning */}}
+    <div class="repo-description">
+    	<div id="repo-desc" class="tw-break-anywhere tw-text-16">
+		    {{$description := .Repository.DescriptionHTML $.Context}}
+		    {{if $description}}<span class="description">{{$description | RenderCodeBlock}}</span>{{else}}<span class="no-description text-italic">{{ctx.Locale.Tr "repo.no_desc"}}</span>{{end}}
+		    {{if .Repository.Website}}
+    			<a class="link tw-mt-1 tw-flex tw-items-center tw-gap-1" href="{{.Repository.Website}}">{{svg "octicon-globe"}} {{.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>
+
+    {{if and .Permission.IsAdmin (not .Repository.IsArchived)}}
+        <div class="ui form tw-hidden tw-flex tw-gap-2 tw-my-3" id="topic_edit">
+		    <div class="ui fluid multiple search selection dropdown tw-flex-wrap tw-flex-1">
+    			<input type="hidden" name="topics" value="{{range $i, $v := .Topics}}{{.Name}}{{if Eval $i "+" 1 "<" (len $.Topics)}},{{end}}{{end}}">
+			    {{range .Topics}}
+    				{{/* keep the same layout as Fomantic UI generated labels */}}
+				    <a class="ui label transition visible tw-cursor-default tw-inline-block" data-value="{{.Name}}">{{.Name}}{{svg "octicon-x" 16 "delete icon"}}</a>
+			    {{end}}
+			    <div class="text"></div>
+		    </div>
+		    <div>
+    			<button class="ui basic button" id="cancel_topic_edit">{{ctx.Locale.Tr "cancel"}}</button>
+			    <button class="ui primary button" id="save_topic" data-link="{{.RepoLink}}/topics">{{ctx.Locale.Tr "save"}}</button>
+		    </div>
+	    </div>
+    {{end}}
+</div>
\ No newline at end of file
diff --git a/templates/repo/empty.tmpl b/templates/repo/empty.tmpl
index 3a8995bfea..5397b33000 100644
--- a/templates/repo/empty.tmpl
+++ b/templates/repo/empty.tmpl
@@ -14,6 +14,9 @@
 						{{end}}
 					</div>
 				{{end}}
+				{{if not .HideRepoInfo}}
+					{{template "repo/description" .}}
+				{{end}}
 				{{if .Repository.IsBroken}}
 						<div class="ui segment center">
 							{{ctx.Locale.Tr "repo.broken_message"}}
diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl
index f480c1f17f..c1db85d2d2 100644
--- a/templates/repo/home.tmpl
+++ b/templates/repo/home.tmpl
@@ -4,36 +4,7 @@
 	<div class="ui container {{if .IsBlame}}fluid padded{{end}}">
 		{{template "base/alert" .}}
 		{{if and (not .HideRepoInfo) (not .IsBlame)}}
-		<div class="repo-description">
-			<div id="repo-desc" class="tw-break-anywhere tw-text-16">
-				{{$description := .Repository.DescriptionHTML $.Context}}
-				{{if $description}}<span class="description">{{$description | RenderCodeBlock}}</span>{{else}}<span class="no-description text-italic">{{ctx.Locale.Tr "repo.no_desc"}}</span>{{end}}
-				{{if .Repository.Website}}
-					<a class="link tw-mt-1 tw-flex tw-items-center tw-gap-1" href="{{.Repository.Website}}">{{svg "octicon-globe"}} {{.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>
-		{{end}}
-		{{if and .Permission.IsAdmin (not .Repository.IsArchived)}}
-		<div class="ui form tw-hidden tw-flex tw-gap-2 tw-my-2" id="topic_edit">
-			<div class="ui fluid multiple search selection dropdown tw-flex-wrap tw-flex-1">
-				<input type="hidden" name="topics" value="{{range $i, $v := .Topics}}{{.Name}}{{if Eval $i "+" 1 "<" (len $.Topics)}},{{end}}{{end}}">
-				{{range .Topics}}
-					{{/* keep the same layout as Fomantic UI generated labels */}}
-					<a class="ui label transition visible tw-cursor-default tw-inline-block" data-value="{{.Name}}">{{.Name}}{{svg "octicon-x" 16 "delete icon"}}</a>
-				{{end}}
-				<div class="text"></div>
-			</div>
-			<div>
-				<button class="ui basic button" id="cancel_topic_edit">{{ctx.Locale.Tr "cancel"}}</button>
-				<button class="ui primary button" id="save_topic" data-link="{{.RepoLink}}/topics">{{ctx.Locale.Tr "save"}}</button>
-			</div>
-		</div>
+			{{template "repo/description" .}}
 		{{end}}
 
 		{{if RepoFlagsEnabled}}