diff --git a/app/assets/javascripts/discourse/views/post_view.js b/app/assets/javascripts/discourse/views/post_view.js
index 1f98d4783f7..b248619b87c 100644
--- a/app/assets/javascripts/discourse/views/post_view.js
+++ b/app/assets/javascripts/discourse/views/post_view.js
@@ -209,7 +209,7 @@ Discourse.PostView = Discourse.GroupedView.extend(Ember.Evented, {
     // If we're meant to highlight a post
     if ((highlightNumber > 1) && (highlightNumber === postNumber)) {
       this.set('controller.highlightOnInsert', null);
-      var $contents = $('.topic-body .contents', $post),
+      var $contents = $('.topic-body', $post),
           origColor = $contents.data('orig-color') || $contents.css('backgroundColor');
 
       $contents.data("orig-color", origColor);
diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss
index a2ddc4f6a20..be14b26ccca 100644
--- a/app/assets/stylesheets/desktop/topic-post.scss
+++ b/app/assets/stylesheets/desktop/topic-post.scss
@@ -596,8 +596,7 @@ iframe {
 
 .moderator {
   .topic-body {
-  background-color: $highlight_background_color;
-  border-bottom: 10px solid $highlight_background_color;
+    background-color: $highlight_background_color;
   }
 }
 
@@ -762,8 +761,8 @@ blockquote { /* solo quotes */
   float: left;
   position: relative;
   padding: 10px 0 15px 0;
-  .highlighted {
-    background-color: $emphasis_background_color !important;
+  &.highlighted {
+    background-color: $emphasis_background_color;
   }
   img, svg {
     max-width: 100%;
@@ -771,9 +770,8 @@ blockquote { /* solo quotes */
 }
 
 .bottom-round.contents.regular {
- -webkit-transition: background-color .25s linear;
- transition: background-color .25s linear;
-
+  -webkit-transition: background-color .25s linear;
+  transition: background-color .25s linear;
 }
 
 .posts-wrapper {