1 files changed, 18 insertions, 17 deletions

diff --git a/webapp/components/emoji_picker/components/emoji_picker_item.jsx b/webapp/components/emoji_picker/components/emoji_picker_item.jsx
index cbafd31c5..af72331be 100644
--- a/webapp/components/emoji_picker/components/emoji_picker_item.jsx
+++ b/webapp/components/emoji_picker/components/emoji_picker_item.jsx
@@ -35,7 +35,7 @@ export default class EmojiPickerItem extends React.PureComponent {
     }
 
     handleMouseOut() {
-        this.props.onItemOut(this.props.emoji);
+        this.props.onItemOut();
     }
 
     handleClick() {
@@ -45,21 +45,7 @@ export default class EmojiPickerItem extends React.PureComponent {
     render() {
         let item = null;
 
-        if (this.props.category === 'recent' || this.props.category === 'custom') {
-            item = (
-                <span
-                    onMouseOver={this.handleMouseOver}
-                    onMouseOut={this.handleMouseOut}
-                    onClick={this.handleClick}
-                    className='emoji-picker__item-wrapper'
-                >
-                    <img
-                        className='emoji-picker__item emoticon'
-                        src={EmojiStore.getEmojiImageUrl(this.props.emoji)}
-                    />
-                </span>
-            );
-        } else {
+        if (this.props.emoji.category) {
             let className;
             if (this.props.isLoaded) {
                 className = 'emojisprite';
@@ -67,7 +53,7 @@ export default class EmojiPickerItem extends React.PureComponent {
                 className = 'emojisprite-loading';
             }
 
-            className += ' emoji-category-' + this.props.category;
+            className += ' emoji-category-' + this.props.emoji.category;
             className += ' emoji-' + this.props.emoji.filename;
 
             item = (
@@ -81,7 +67,22 @@ export default class EmojiPickerItem extends React.PureComponent {
                     />
                 </div>
             );
+        } else {
+            item = (
+                <span
+                    onMouseOver={this.handleMouseOver}
+                    onMouseOut={this.handleMouseOut}
+                    onClick={this.handleClick}
+                    className='emoji-picker__item-wrapper'
+                >
+                    <img
+                        className='emoji-picker__item emoticon'
+                        src={EmojiStore.getEmojiImageUrl(this.props.emoji)}
+                    />
+                </span>
+            );
         }
+
         return item;
     }
 }