diff --git a/Changelog.md b/Changelog.md
index af64e5f49..8afc63935 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -30,6 +30,7 @@
 * Do not parse hashtags inside Markdown links [#3692](https://github.com/diaspora/diaspora/issues/3692)
 * Restore comment textarea content after revealing more comments [#4514](https://github.com/diaspora/diaspora/issues/4514)
 * OpenGraph: don't make description into links [#4492](https://github.com/diaspora/diaspora/issues/4492)
+* Don't cut off long tags in stream posts [#4864](https://github.com/diaspora/diaspora/issues/4864)
 
 ## Features
 * You can report a single post by clicking the correct icon in the controler section [#4517](https://github.com/diaspora/diaspora/pull/4517)
diff --git a/app/assets/stylesheets/application.css.sass b/app/assets/stylesheets/application.css.sass
index 8c2bcc79e..c0555449e 100644
--- a/app/assets/stylesheets/application.css.sass
+++ b/app/assets/stylesheets/application.css.sass
@@ -879,6 +879,7 @@ ul#press_logos
 
 .tag
   :display inline-block
+  :max-width 100%
   &:hover
     :text
       :decoration underline