diff --git a/webapp/components/post_view/components/post_info.jsx b/webapp/components/post_view/components/post_info.jsx
index e7cb9ffb04..0cb8ff5ac7 100644
--- a/webapp/components/post_view/components/post_info.jsx
+++ b/webapp/components/post_view/components/post_info.jsx
@@ -318,10 +318,9 @@ export default class PostInfo extends React.Component {
 
     reactEmojiClick(emoji) {
         const pickerOffset = 21;
-
+        this.setState({showEmojiPicker: false, reactionPickerOffset: pickerOffset});
         const emojiName = emoji.name || emoji.aliases[0];
         PostActions.addReaction(this.props.post.channel_id, this.props.post.id, emojiName);
-        this.setState({showEmojiPicker: false, reactionPickerOffset: pickerOffset});
     }
 
     render() {
@@ -374,7 +373,7 @@ export default class PostInfo extends React.Component {
                             container={this}
                             onHide={() => this.setState({showEmojiPicker: false})}
                             target={() => ReactDOM.findDOMNode(this.refs['reactIcon_' + post.id])}
-
+                            animation={false}
                         >
                             <EmojiPicker
                                 onEmojiClick={this.reactEmojiClick}
diff --git a/webapp/components/rhs_comment.jsx b/webapp/components/rhs_comment.jsx
index 10cd5fb555..e7d55813d0 100644
--- a/webapp/components/rhs_comment.jsx
+++ b/webapp/components/rhs_comment.jsx
@@ -597,7 +597,7 @@ export default class RhsComment extends React.Component {
                     container={this.refs['post_body_' + post.id]}
                     onHide={() => this.setState({showReactEmojiPicker: false})}
                     target={() => ReactDOM.findDOMNode(this.refs['rhs_reacticon_' + post.id])}
-
+                    animation={false}
                 >
                     <EmojiPicker
                         onEmojiClick={this.reactEmojiClick}
diff --git a/webapp/components/rhs_root_post.jsx b/webapp/components/rhs_root_post.jsx
index 41dd92e91f..023387bb42 100644
--- a/webapp/components/rhs_root_post.jsx
+++ b/webapp/components/rhs_root_post.jsx
@@ -171,9 +171,9 @@ export default class RhsRootPost extends React.Component {
     }
 
     reactEmojiClick(emoji) {
+        this.setState({showRHSEmojiPicker: false});
         const emojiName = emoji.name || emoji.aliases[0];
         addReaction(this.props.post.channel_id, this.props.post.id, emojiName);
-        this.setState({showRHSEmojiPicker: false});
     }
 
     render() {
@@ -245,7 +245,7 @@ export default class RhsRootPost extends React.Component {
                     container={this}
                     onHide={() => this.setState({showRHSEmojiPicker: false})}
                     target={() => ReactDOM.findDOMNode(this.refs.rhs_root_reacticon)}
-
+                    animation={false}
                 >
                     <EmojiPicker
                         onEmojiClick={this.reactEmojiClick}