diff --git a/app/assets/javascripts/discourse/app/templates/full-page-search.hbs b/app/assets/javascripts/discourse/app/templates/full-page-search.hbs
index 6cd5dfc767e..946d324389a 100644
--- a/app/assets/javascripts/discourse/app/templates/full-page-search.hbs
+++ b/app/assets/javascripts/discourse/app/templates/full-page-search.hbs
@@ -104,9 +104,9 @@
                       {{category-link result.topic.category.parentCategory}}
                     {{/if}}
                     {{category-link result.topic.category hideParent=true}}
-                    {{#each result.topic.tags as |tag|}}
-                      {{discourse-tag tag isPrivateMessage=isPrivateMessage}}
-                    {{/each}}
+                    {{#if result.topic.tags}}
+                      {{discourse-tags result.topic}}
+                    {{/if}}
                     {{plugin-outlet name="full-page-search-category" args=(hash result=result)}}
                   </div>
                 </div>
diff --git a/app/assets/stylesheets/common/base/search.scss b/app/assets/stylesheets/common/base/search.scss
index e4d85303acf..a6154bfc19d 100644
--- a/app/assets/stylesheets/common/base/search.scss
+++ b/app/assets/stylesheets/common/base/search.scss
@@ -226,6 +226,17 @@
     }
   }
 
+  .discourse-tags {
+    flex-wrap: wrap;
+    display: inline-flex;
+    font-weight: normal;
+
+    .discourse-tag.simple {
+      font-size: $font-down-1;
+      margin-right: 0.25em;
+    }
+  }
+
   input[type="checkbox"] {
     margin-top: 0;
     margin-left: 0;