diff --git a/plugins/talk-plugin-featured-comments/client/components/ModActionButton.js b/plugins/talk-plugin-featured-comments/client/components/ModActionButton.js
index b1811d2fc..8290ae8b6 100644
--- a/plugins/talk-plugin-featured-comments/client/components/ModActionButton.js
+++ b/plugins/talk-plugin-featured-comments/client/components/ModActionButton.js
@@ -31,12 +31,12 @@ export class ModActionButton extends React.Component {
 
   handleDeleteTag = () => {
     this.props.deleteTag();
-    this.props.closeTooltip();
+    this.props.closeMenu();
   }
 
   handlePostTag = () => {
     this.props.postTag();
-    this.props.closeTooltip();
+    this.props.closeMenu();
   }
 
   render() {
diff --git a/plugins/talk-plugin-featured-comments/client/containers/ModActionButton.js b/plugins/talk-plugin-featured-comments/client/containers/ModActionButton.js
index 520ce9344..6f02164b2 100644
--- a/plugins/talk-plugin-featured-comments/client/containers/ModActionButton.js
+++ b/plugins/talk-plugin-featured-comments/client/containers/ModActionButton.js
@@ -2,11 +2,11 @@ import {compose} from 'react-apollo';
 import {bindActionCreators} from 'redux';
 import ModActionButton from '../components/ModActionButton';
 import {withTags, connect} from 'plugin-api/beta/client/hocs';
-import {closeTooltip} from 'plugins/talk-plugin-moderation-actions/client/actions';
+import {closeMenu} from 'plugins/talk-plugin-moderation-actions/client/actions';
 
 const mapDispatchToProps = (dispatch) =>
   bindActionCreators({
-    closeTooltip,
+    closeMenu,
   }, dispatch);
 
 const enhance = compose(
diff --git a/plugins/talk-plugin-moderation-actions/client/components/ModerationActions.js b/plugins/talk-plugin-moderation-actions/client/components/ModerationActions.js
index fcb350979..a4a753d60 100644
--- a/plugins/talk-plugin-moderation-actions/client/components/ModerationActions.js
+++ b/plugins/talk-plugin-moderation-actions/client/components/ModerationActions.js
@@ -26,10 +26,9 @@ export default class ModerationActions extends React.Component {
                 fill="moderationActions"
                 queryData={{comment, asset}}
                 data={data}
-                hideMenu={hideMenu}
               />
-              <ApproveCommentAction comment={comment} hideTooltip={hideTooltip} />
-              <RejectCommentAction comment={comment} hideTooltip={hideTooltip} />
+              <ApproveCommentAction comment={comment} hideMenu={hideMenu} />
+              <RejectCommentAction comment={comment} hideMenu={hideMenu} />
             </Menu>
           )}
         </div>
diff --git a/plugins/talk-plugin-moderation-actions/client/containers/ApproveCommentAction.js b/plugins/talk-plugin-moderation-actions/client/containers/ApproveCommentAction.js
index 3cca0bda6..4c4a457a2 100644
--- a/plugins/talk-plugin-moderation-actions/client/containers/ApproveCommentAction.js
+++ b/plugins/talk-plugin-moderation-actions/client/containers/ApproveCommentAction.js
@@ -1,8 +1,7 @@
 import React from 'react';
+import {compose} from 'react-apollo';
 import {bindActionCreators} from 'redux';
-import {connect} from 'plugin-api/beta/client/hocs';
 import {getErrorMessages} from 'plugin-api/beta/client/utils';
-import {withSetCommentStatus} from 'plugin-api/beta/client/hocs';
 import {notify} from 'plugin-api/beta/client/actions/notification';
 import ApproveCommentAction from '../components/ApproveCommentAction';
 import {connect, withSetCommentStatus} from 'plugin-api/beta/client/hocs';
diff --git a/plugins/talk-plugin-moderation-actions/client/containers/RejectCommentAction.js b/plugins/talk-plugin-moderation-actions/client/containers/RejectCommentAction.js
index e13ddf32c..246cdfe2d 100644
--- a/plugins/talk-plugin-moderation-actions/client/containers/RejectCommentAction.js
+++ b/plugins/talk-plugin-moderation-actions/client/containers/RejectCommentAction.js
@@ -1,8 +1,7 @@
 import React from 'react';
+import {compose} from 'react-apollo';
 import {bindActionCreators} from 'redux';
-import {connect} from 'plugin-api/beta/client/hocs';
 import {getErrorMessages} from 'plugin-api/beta/client/utils'
-import {withSetCommentStatus} from 'plugin-api/beta/client/hocs';
 import {notify} from 'plugin-api/beta/client/actions/notification';
 import RejectCommentAction from '../components/RejectCommentAction';
 import {connect, withSetCommentStatus} from 'plugin-api/beta/client/hocs';