diff --git a/app/assets/javascripts/discourse/views/topic_view.js b/app/assets/javascripts/discourse/views/topic_view.js
index eece4e34fc4..b07c638cacd 100644
--- a/app/assets/javascripts/discourse/views/topic_view.js
+++ b/app/assets/javascripts/discourse/views/topic_view.js
@@ -413,9 +413,11 @@ Discourse.TopicView.reopenClass({
 
           $contents.data("orig-color", origColor);
           $contents
-            .css({ backgroundColor: "#ffffcc" })
+            .addClass('highlighted')
             .stop()
-            .animate({ backgroundColor: origColor }, 2500);
+            .animate({ backgroundColor: origColor }, 2500, 'swing', function(){
+              $contents.removeClass('highlighted');
+            });
         }
       }
     });
diff --git a/app/assets/stylesheets/application/topic-post.css.scss b/app/assets/stylesheets/application/topic-post.css.scss
index fac9e99bbbf..14c5197344a 100644
--- a/app/assets/stylesheets/application/topic-post.css.scss
+++ b/app/assets/stylesheets/application/topic-post.css.scss
@@ -563,6 +563,9 @@
             margin: 0 0 5px 0;
           }
         }
+        &.highlighted {
+          background-color: $highlight;
+        }
       }
       .contents.bottom-round {
         overflow: hidden;