diff --git a/app/gabsocial/components/emoji_selector.js b/app/gabsocial/components/emoji_selector.js
new file mode 100644
index 000000000..fabc276dd
--- /dev/null
+++ b/app/gabsocial/components/emoji_selector.js
@@ -0,0 +1,28 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { ALLOWED_EMOJI } from 'gabsocial/utils/emoji_reacts';
+import emojify from 'gabsocial/features/emoji/emoji';
+
+export default class EmojiSelector extends React.Component {
+
+  propTypes = {
+    onReact: PropTypes.func.isRequired,
+  }
+
+  render() {
+    const { onReact } = this.props;
+
+    return (
+      <div className='emoji-react-selector'>
+        {ALLOWED_EMOJI.map(emoji => (
+          <button
+            className='emoji-react-selector__emoji'
+            dangerouslySetInnerHTML={{ __html: emojify(emoji) }}
+            onClick={onReact(emoji)}
+          />
+        ))}
+      </div>
+    );
+  }
+
+}
diff --git a/app/gabsocial/features/status/components/action_bar.js b/app/gabsocial/features/status/components/action_bar.js
index 1e9450f99..f6dd17aa8 100644
--- a/app/gabsocial/features/status/components/action_bar.js
+++ b/app/gabsocial/features/status/components/action_bar.js
@@ -8,8 +8,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import DropdownMenuContainer from '../../../containers/dropdown_menu_container';
 import { defineMessages, injectIntl } from 'react-intl';
 import { isStaff } from 'gabsocial/utils/accounts';
-import { ALLOWED_EMOJI } from 'gabsocial/utils/emoji_reacts';
-import emojify from 'gabsocial/features/emoji/emoji';
+import EmojiSelector from 'gabsocial/components/emoji_selector';
 
 const messages = defineMessages({
   delete: { id: 'status.delete', defaultMessage: 'Delete' },
@@ -265,15 +264,7 @@ class ActionBar extends React.PureComponent {
           />
         </div>
         <div className='detailed-status__button detailed-status__button--favourite'>
-          <div className='emoji-react-selector'>
-            {ALLOWED_EMOJI.map(emoji => (
-              <button
-                className='emoji-react-selector__emoji'
-                dangerouslySetInnerHTML={{ __html: emojify(emoji) }}
-                onClick={this.handleReactClick(emoji)}
-              />
-            ))}
-          </div>
+          <EmojiSelector onReact={this.handleReactClick} />
           <IconButton
             className='star-icon'
             animate active={status.get('favourited')}