diff --git a/app/assets/stylesheets/desktop/compose.scss b/app/assets/stylesheets/desktop/compose.scss
index a78865fef2e..02ab6cbd2f2 100644
--- a/app/assets/stylesheets/desktop/compose.scss
+++ b/app/assets/stylesheets/desktop/compose.scss
@@ -160,6 +160,7 @@
     }
     span.topic {
       display: flex;
+      flex-wrap: wrap;
     }
   }
   .badge-wrapper {