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 37898b35e4..f95bc36dc7 100644
--- a/app/assets/javascripts/discourse/app/templates/full-page-search.hbs
+++ b/app/assets/javascripts/discourse/app/templates/full-page-search.hbs
@@ -104,7 +104,9 @@
                       {{category-link result.topic.category.parentCategory}}
                     {{/if}}
                     {{category-link result.topic.category hideParent=true}}
-                    {{discourse-tags result.topic}}
+                    {{#each result.topic.tags as |tag|}}
+                      {{discourse-tag tag isPrivateMessage=isPrivateMessage}}
+                    {{/each}}
                     {{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 ed441c964c..e4d85303ac 100644
--- a/app/assets/stylesheets/common/base/search.scss
+++ b/app/assets/stylesheets/common/base/search.scss
@@ -226,17 +226,6 @@
     }
   }
 
-  .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;
@@ -288,6 +277,11 @@
       }
     }
   }
+
+  .discourse-tag.simple {
+    font-size: $font-down-1;
+    margin-right: 0.25em;
+  }
 }
 
 .no-results-suggestion {