diff --git a/web/react/components/mention_list.jsx b/web/react/components/mention_list.jsx
index 8294624567..09313bbbd4 100644
--- a/web/react/components/mention_list.jsx
+++ b/web/react/components/mention_list.jsx
@@ -21,7 +21,9 @@ module.exports = React.createClass({
         var self = this;
 
         $('.post-right__scroll').scroll(function(){
-            self.forceUpdate();
+            if($('.mentions--top').length){
+                $('#reply_mention_tab .mentions--top').css({ bottom: $(window).height() - $('.post-right__scroll #reply_textbox').offset().top });
+            }
         });
 
         $('body').on('keydown.mentionlist', '#'+this.props.id,