diff --git a/browser/components/markdown.styl b/browser/components/markdown.styl
index 53e93574..0600d9ab 100644
--- a/browser/components/markdown.styl
+++ b/browser/components/markdown.styl
@@ -120,6 +120,7 @@ hr
   margin 15px 0
 h1, h2, h3, h4, h5, h6
   font-weight bold
+  word-wrap break-word
 h1
   font-size 2.55em
   padding-bottom 0.3em
@@ -157,6 +158,7 @@ p
   line-height 1.6em
   margin 0 0 1em
   white-space pre-line
+  word-wrap break-word
 img
   max-width 100%
 strong, b
@@ -338,4 +340,4 @@ body[data-theme="dark"]
 body[data-theme="solarized-dark"]
   color $ui-solarized-dark-text-color
   border-color themeDarkBorder
-  background-color $ui-solarized-dark-noteDetail-backgroundColor
\ No newline at end of file
+  background-color $ui-solarized-dark-noteDetail-backgroundColor