diff --git a/reviewboard/static/rb/css/pages/diffviewer.less b/reviewboard/static/rb/css/pages/diffviewer.less
index 7b8bfe51c6f4d6edb5f6d30fd051850b3dc17311..fdd8b1699640c0e314d6c82111db2566109121a8 100644
--- a/reviewboard/static/rb/css/pages/diffviewer.less
+++ b/reviewboard/static/rb/css/pages/diffviewer.less
@@ -275,6 +275,7 @@
 
     &.whitespace-file td {
       background: @diff-replace-color;
+      border-bottom: 1px @diff-file-border-color solid;
       padding: 1em;
     }
 
diff --git a/reviewboard/templates/diffviewer/diff_file_fragment.html b/reviewboard/templates/diffviewer/diff_file_fragment.html
index 85e8562c81dda3f1f844042c54621abe51189800..fb1031d8a5e9b2fc2e45593c8204d16893257578 100644
--- a/reviewboard/templates/diffviewer/diff_file_fragment.html
+++ b/reviewboard/templates/diffviewer/diff_file_fragment.html
@@ -202,7 +202,7 @@
   </tr>
  </tbody>
 {% else %}
-{%  if file.whitespace_only %}
+{%  if file.whitespace_only and not standalone %}
  <tbody class="whitespace-file">
   <tr>
    <td colspan="4">{% trans "This file contains only whitespace changes." %}</td>