diff --git a/Changelog.md b/Changelog.md
index f737205f3..1a957fa40 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -145,6 +145,7 @@ diaspora.yml file**. The existing settings from 0.4.x and before will not work a
 * Fix overflow for headings, blockquotes and other elements [#5731](https://github.com/diaspora/diaspora/pull/5731)
 * Correct photo count on profile page [#5751](https://github.com/diaspora/diaspora/pull/5751)
 * Fix mobile sign up from an invitation [#5754](https://github.com/diaspora/diaspora/pull/5754)
+* Set max-width for tag following button on tag page [#5752](https://github.com/diaspora/diaspora/pull/5752)
 
 ## Features
 * Don't pull jQuery from a CDN by default [#5105](https://github.com/diaspora/diaspora/pull/5105)
diff --git a/app/assets/stylesheets/tag.scss b/app/assets/stylesheets/tag.scss
index 5b6d7675f..7b0036d4b 100644
--- a/app/assets/stylesheets/tag.scss
+++ b/app/assets/stylesheets/tag.scss
@@ -35,4 +35,14 @@ h1.tag {
       }
     }
   }
+  .span7 {
+    .tag-following-action {
+      max-width: 100%;
+      input[type="submit"] {
+        overflow-x: hidden;
+        text-overflow: ellipsis;
+        max-width: 100%;
+      }    
+    }
+  }
 }
diff --git a/app/assets/templates/tag_following_action_tpl.jst.hbs b/app/assets/templates/tag_following_action_tpl.jst.hbs
index 134996113..2d31000f4 100644
--- a/app/assets/templates/tag_following_action_tpl.jst.hbs
+++ b/app/assets/templates/tag_following_action_tpl.jst.hbs
@@ -1,4 +1,4 @@
-<div class="pull-right">
+<div class="pull-right tag-following-action">
   <form accept-charset="UTF-8" action="/tag_followings" method="post">
       <input type="submit" class="btn 
       {{#if tag_is_followed }}