diff --git a/app/assets/stylesheets/generic/common.scss b/app/assets/stylesheets/generic/common.scss
index 1a7e96f1d0c..3db821fdf76 100644
--- a/app/assets/stylesheets/generic/common.scss
+++ b/app/assets/stylesheets/generic/common.scss
@@ -333,6 +333,10 @@ table {
   margin-bottom: 9px;
 }
 
+.wiki .code {
+  overflow-x: auto;
+}
+
 .footer-links a {
   margin-right: 15px;
 }
diff --git a/app/assets/stylesheets/generic/highlight.scss b/app/assets/stylesheets/generic/highlight.scss
index e1ca86af816..0f8225d6823 100644
--- a/app/assets/stylesheets/generic/highlight.scss
+++ b/app/assets/stylesheets/generic/highlight.scss
@@ -59,6 +59,7 @@
   box-shadow: none;
   background: $box_bg;
   padding: 1em;
+  overflow-x: auto;
 
   code {
     font-family: $monospace_font;