diff --git a/app/assets/stylesheets/common/base/search-menu.scss b/app/assets/stylesheets/common/base/search-menu.scss
index 170142a6dc4..0ba64993ba9 100644
--- a/app/assets/stylesheets/common/base/search-menu.scss
+++ b/app/assets/stylesheets/common/base/search-menu.scss
@@ -57,6 +57,19 @@
       }
     }
 
+    .search-result-topic {
+      .second-line {
+        display: flex;
+        flex-wrap: wrap;
+        align-items: center;
+
+        .discourse-tags {
+          flex-wrap: wrap;
+          display: contents;
+        }
+      }
+    }
+
     .main-results {
       display: flex;
       flex: 1 1 auto;
@@ -253,17 +266,6 @@
     .topic {
       display: inline-block;
       line-height: $line-height-medium;
-
-      .second-line {
-        display: flex;
-        flex-wrap: wrap;
-        align-items: center;
-
-        .discourse-tags {
-          flex-wrap: wrap;
-          display: contents;
-        }
-      }
     }
 
     .topic-title {
diff --git a/app/assets/stylesheets/desktop/compose.scss b/app/assets/stylesheets/desktop/compose.scss
index 0594ca8e51d..f4b49765194 100644
--- a/app/assets/stylesheets/desktop/compose.scss
+++ b/app/assets/stylesheets/desktop/compose.scss
@@ -191,8 +191,23 @@
     }
     span.topic {
       display: flex;
-      align-items: baseline;
-      flex-wrap: wrap;
+      flex-direction: column;
+
+      .first-line {
+        flex: 1;
+      }
+
+      .second-line {
+        display: flex;
+        flex-wrap: wrap;
+        align-items: center;
+
+        .discourse-tags {
+          flex-wrap: wrap;
+          display: contents;
+          font-size: $font-down-1;
+        }
+      }
     }
   }
 }