diff --git a/app/assets/stylesheets/common/foundation/base.scss b/app/assets/stylesheets/common/foundation/base.scss
index 4d22e56cd25..eb046807f20 100644
--- a/app/assets/stylesheets/common/foundation/base.scss
+++ b/app/assets/stylesheets/common/foundation/base.scss
@@ -55,7 +55,7 @@ dd {
 
 
 .cooked ul, .cooked ol, .cooked dd {
-  clear: both;  
+  clear: both;
 }
 
 li {
diff --git a/app/assets/stylesheets/desktop/topic.scss b/app/assets/stylesheets/desktop/topic.scss
index 5d1c1f8b093..1625ee99665 100644
--- a/app/assets/stylesheets/desktop/topic.scss
+++ b/app/assets/stylesheets/desktop/topic.scss
@@ -218,7 +218,16 @@ a:hover.reply-new {
 code,kbd,pre,samp{
   font-family:monospace, serif; font-size:1em;
 }
-pre { white-space:pre-wrap;}
+pre {
+  code {
+  white-space:pre-wrap;
+  display: block;
+  padding: 5px 10px;
+  color: $primary_text_color;
+  background: lighten($secondary_background_color, 76%);
+  max-height: 500px;
+  }
+}
 q{ quotes:"\201C" "\201D" "\2018" "\2019"; }
 small{ font-size:80%; }
 sub,sup{