diff --git a/app/assets/javascripts/discourse/templates/modal/history.js.handlebars b/app/assets/javascripts/discourse/templates/modal/history.js.handlebars
index a7683aa83d3..d01e42789c2 100644
--- a/app/assets/javascripts/discourse/templates/modal/history.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/modal/history.js.handlebars
@@ -19,6 +19,8 @@
     <div id="revision-details">
       {{i18n post.revisions.details.edited_by}} {{avatar this imageSize="small"}} {{username}} <span class="date">{{date path="created_at" leaveAgo="true"}}</span> {{#if edit_reason}} &mdash; <span class="edit-reason">{{edit_reason}}</span>{{/if}}
     </div>
-    {{{diff}}}
+    <div id="revisions">
+      {{{diff}}}
+    </div>
   {{/if}}
 </div>
diff --git a/app/assets/stylesheets/desktop/history.scss b/app/assets/stylesheets/desktop/history.scss
index 5355b2f1d76..23510d4ab1b 100644
--- a/app/assets/stylesheets/desktop/history.scss
+++ b/app/assets/stylesheets/desktop/history.scss
@@ -19,17 +19,17 @@
     padding: 5px;
     margin-top: 10px;
   }
+  #revisions {
+    word-wrap: break-word;
+  }
   img {
     max-width: 670px;
     height: auto;
   }
   .inline-diff {
     width: 670px;
-    word-wrap: break-word;
   }
   .markdown {
-    word-wrap: break-word;
-    white-space: pre-wrap;
     font-family: monospace;
     font-size: 12px;
     width: 100%;
@@ -38,6 +38,9 @@
     td {
       width: 50%;
       vertical-align: top;
+      max-width: 440px;
+      word-wrap: break-word;
+      white-space: pre-wrap;
     }
   }
   .span8, .markdown {