diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1186efb3..1123c332 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # ChangeLog
 
+## HEAD
+
+- Set proper word-wrap for long lines
+
 ## 1.7.0 (2018-05-24)
 
 - Use Google Fonts CSS directly with preconnect
diff --git a/_sass/whiteglass/_base.scss b/_sass/whiteglass/_base.scss
index 5ce58799..8d102531 100644
--- a/_sass/whiteglass/_base.scss
+++ b/_sass/whiteglass/_base.scss
@@ -23,6 +23,7 @@ body {
        -o-font-feature-settings: "kern" 1;
           font-feature-settings: "kern" 1;
   font-kerning: normal;
+  word-wrap: break-word;
 }
 
 table {
@@ -163,6 +164,7 @@ code {
 pre {
   padding: 8px 12px;
   overflow-x: auto;
+  word-wrap: normal;
 
   > code {
     border: 0;