diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index d4806cf5fd1..14617ebe50c 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -137,6 +137,8 @@ Bug Fixes
 * SOLR-8983: Cleanup clusterstate and replicas for a failed create collection request
   (Varun Thacker, Anshum Gupta)
 
+* SOLR-8990: Fix top term links from schema browser page to use {!term} parser (hossman)
+
 Optimizations
 ----------------------
 * SOLR-8722: Don't force a full ZkStateReader refresh on every Overseer operation.
diff --git a/solr/webapp/web/js/angular/app.js b/solr/webapp/web/js/angular/app.js
index c67115cbc5e..8a1fe26c593 100644
--- a/solr/webapp/web/js/angular/app.js
+++ b/solr/webapp/web/js/angular/app.js
@@ -143,6 +143,9 @@ solrAdminApp.config([
   IS_COLLECTION_PAGE: 3,
   ROOT_URL: "/"
 })
+.filter('uriencode', function() {
+  return window.encodeURIComponent;
+})
 .filter('highlight', function($sce) {
   return function(input, lang) {
     if (lang && input && lang!="text") return hljs.highlight(lang, input).value;
diff --git a/solr/webapp/web/partials/schema.html b/solr/webapp/web/partials/schema.html
index b91a92c1def..ca626fd74c1 100644
--- a/solr/webapp/web/partials/schema.html
+++ b/solr/webapp/web/partials/schema.html
@@ -315,7 +315,7 @@ limitations under the License.
                 <li class="clearfix" ng-repeat="countGroup in termInfo.topTerms">
                     <p><span>{{countGroup.count}}</span></p>
                     <ul>
-                        <li ng-repeat="term in countGroup.terms" ng-class="{odd:$odd}"><a href="#/{{core}}/query?q={{name}}:{{term}}">{{term}}</a></li>
+                        <li ng-repeat="term in countGroup.terms" ng-class="{odd:$odd}"><a ng-href="#/{{core}}/query?q=%7B!term+f%3D{{name | uriencode}}%7D{{term | uriencode}}">{{term}}</a></li>
                     </ul>
                 </li>