diff --git a/app/assets/javascripts/components/components/button.jsx b/app/assets/javascripts/components/components/button.jsx
index c3e1840246a..6c3da10fe10 100644
--- a/app/assets/javascripts/components/components/button.jsx
+++ b/app/assets/javascripts/components/components/button.jsx
@@ -44,7 +44,10 @@ const Button = React.createClass({
cursor: 'pointer',
lineHeight: `${this.props.size}px`,
borderRadius: '4px',
- textDecoration: 'none'
+ textDecoration: 'none',
+ whiteSpace: 'nowrap',
+ textOverflow: 'ellipsis',
+ overflow: 'hidden'
};
return (
diff --git a/app/assets/javascripts/components/features/compose/components/compose_form.jsx b/app/assets/javascripts/components/features/compose/components/compose_form.jsx
index fad77c8e9d6..805aad3d52d 100644
--- a/app/assets/javascripts/components/features/compose/components/compose_form.jsx
+++ b/app/assets/javascripts/components/features/compose/components/compose_form.jsx
@@ -197,9 +197,9 @@ const ComposeForm = React.createClass({