diff --git a/src/assets/stylesheets/base/_typeset.scss b/src/assets/stylesheets/base/_typeset.scss
index 5ae260d02..b85461a5e 100644
--- a/src/assets/stylesheets/base/_typeset.scss
+++ b/src/assets/stylesheets/base/_typeset.scss
@@ -234,6 +234,7 @@ kbd {
       box-shadow: none;
       box-decoration-break: slice;
       overflow: auto;
+      word-break: normal;
 
       // Override native scrollbar styles
       &::-webkit-scrollbar {
diff --git a/src/assets/stylesheets/extensions/_codehilite.scss b/src/assets/stylesheets/extensions/_codehilite.scss
index 911baeaaf..631c5b358 100644
--- a/src/assets/stylesheets/extensions/_codehilite.scss
+++ b/src/assets/stylesheets/extensions/_codehilite.scss
@@ -248,8 +248,8 @@ $codehilite-whitespace: transparent;
     // Disable user selection, so code can be easily copied without
     // accidentally also copying the line numbers
     .linenos {
-      background-color: $md-color-black--lightest;
       color: $md-color-black--lighter;
+      box-shadow: inset 0 0 0 px2rem(1px) $md-code-background;
       user-select: none;
 
       // Reset spacings