diff --git a/templates/explore/repo_list.tmpl b/templates/explore/repo_list.tmpl
index b05b0e469..f27990701 100755
--- a/templates/explore/repo_list.tmpl
+++ b/templates/explore/repo_list.tmpl
@@ -143,7 +143,7 @@
 					{{if .Topics }}
 						<div class="ui tags">
 						{{range .Topics}}
-							{{if ne . "" }}<a href="{{AppSubUrl}}/explore/repos?q=&topic={{.}}"><div class="ui small label topic">{{.}}</div></a>{{end}}
+							{{if ne . "" }}<a href="{{AppSubUrl}}/explore/repos?q={{.}}&topic={{$.Topic}}"><div class="ui small label topic">{{.}}</div></a>{{end}}
 						{{end}}
 						</div>
 					{{end}}
diff --git a/templates/org/repo_list.tmpl b/templates/org/repo_list.tmpl
index 2e047d209..eab03c591 100644
--- a/templates/org/repo_list.tmpl
+++ b/templates/org/repo_list.tmpl
@@ -58,7 +58,7 @@
 				{{if .Topics }}
 					<div class="ui tags">
 					{{range .Topics}}
-						{{if ne . "" }}<a href="{{AppSubUrl}}/explore/repos?q={{.}}&topic=1"><div class="ui small label topic">{{.}}</div></a>{{end}}
+						{{if ne . "" }}<a href="{{AppSubUrl}}/explore/repos?q={{.}}&topic={{$.Topic}}"><div class="ui small label topic">{{.}}</div></a>{{end}}
 					{{end}}
 					</div>
 				{{end}}