diff --git a/app/soapbox/components/status_action_bar.js b/app/soapbox/components/status_action_bar.js
index 1ee84ca00..579617145 100644
--- a/app/soapbox/components/status_action_bar.js
+++ b/app/soapbox/components/status_action_bar.js
@@ -367,7 +367,9 @@ class StatusActionBar extends ImmutablePureComponent {
           onMouseLeave={this.handleLikeButtonLeave}
           ref={this.setRef}
         >
-          <EmojiSelector onReact={this.handleReactClick} visible={emojiSelectorVisible} />
+          { emojiSelectorVisible &&
+            <EmojiSelector onReact={this.handleReactClick} visible={emojiSelectorVisible} />
+          }
           <IconButton
             className='status__action-bar-button star-icon'
             animate
diff --git a/app/soapbox/features/status/components/action_bar.js b/app/soapbox/features/status/components/action_bar.js
index c5db0cab5..de3969f27 100644
--- a/app/soapbox/features/status/components/action_bar.js
+++ b/app/soapbox/features/status/components/action_bar.js
@@ -311,7 +311,9 @@ class ActionBar extends React.PureComponent {
           onMouseLeave={this.handleLikeButtonLeave}
           ref={this.setRef}
         >
-          <EmojiSelector onReact={this.handleReactClick} visible={emojiSelectorVisible} />
+          { emojiSelectorVisible &&
+            <EmojiSelector onReact={this.handleReactClick} visible={emojiSelectorVisible} />
+          }
           <IconButton
             className='star-icon'
             animate