diff --git a/app/assets/stylesheets/common/base/search-menu.scss b/app/assets/stylesheets/common/base/search-menu.scss
index fc4c6d43d38..0407efd00b8 100644
--- a/app/assets/stylesheets/common/base/search-menu.scss
+++ b/app/assets/stylesheets/common/base/search-menu.scss
@@ -68,8 +68,11 @@
         align-items: center;
 
         .discourse-tags {
+          display: flex;
           flex-wrap: wrap;
-          display: contents;
+          .discourse-tag {
+            margin-right: 0.25em;
+          }
         }
       }
 
diff --git a/app/assets/stylesheets/common/base/tagging.scss b/app/assets/stylesheets/common/base/tagging.scss
index 398da477bbc..5bc74ea0c90 100644
--- a/app/assets/stylesheets/common/base/tagging.scss
+++ b/app/assets/stylesheets/common/base/tagging.scss
@@ -129,7 +129,7 @@
 .discourse-tags,
 .list-tags,
 .search-category {
-  .discourse-tag.simple:not(:last-of-type):after {
+  .discourse-tag.simple:not(:last-child):after {
     content: ", ";
     margin-left: 1px;
   }
diff --git a/app/assets/stylesheets/desktop/compose.scss b/app/assets/stylesheets/desktop/compose.scss
index c3423a356d2..e8e3345a2e2 100644
--- a/app/assets/stylesheets/desktop/compose.scss
+++ b/app/assets/stylesheets/desktop/compose.scss
@@ -207,7 +207,6 @@
 
         .discourse-tags {
           flex-wrap: wrap;
-          display: contents;
           font-size: $font-down-1;
         }
       }