diff --git a/app/assets/stylesheets/application/compose.css.scss b/app/assets/stylesheets/application/compose.css.scss
index ab044e448a0..99c50848840 100644
--- a/app/assets/stylesheets/application/compose.css.scss
+++ b/app/assets/stylesheets/application/compose.css.scss
@@ -314,6 +314,7 @@
       padding: 7px;
       margin: 0;
       background-color: $white;
+      word-wrap: break-word;
     }
     #wmd-input {
       position: absolute;