diff --git a/client/coral-admin/src/routes/Moderation/components/Moderation.js b/client/coral-admin/src/routes/Moderation/components/Moderation.js
index 1c1ce1009..47051adfe 100644
--- a/client/coral-admin/src/routes/Moderation/components/Moderation.js
+++ b/client/coral-admin/src/routes/Moderation/components/Moderation.js
@@ -204,6 +204,7 @@ export default class Moderation extends Component {
             rejectComment={props.rejectComment} />
         )}
         <StorySearch
+          assetId={assetId}
           moderation={this.props.moderation}
           closeSearch={this.closeSearch}
           storySearchChange={this.props.storySearchChange}
diff --git a/client/coral-admin/src/routes/Moderation/components/StorySearch.css b/client/coral-admin/src/routes/Moderation/components/StorySearch.css
index ea8dd6b43..2df130ec4 100644
--- a/client/coral-admin/src/routes/Moderation/components/StorySearch.css
+++ b/client/coral-admin/src/routes/Moderation/components/StorySearch.css
@@ -49,13 +49,14 @@
   font-weight: 300;
 }
 
-.cta a {
+.cta > a {
+  display: inline-block;
+  cursor: pointer;
   color: #000;
   text-decoration: none;
   font-weight: bold;
   font-size: 15px;
   margin: 0;
-  height: 50px;
   box-sizing: border-box;
   font-size: 15px;
   font-weight: 500;
diff --git a/client/coral-admin/src/routes/Moderation/components/StorySearch.js b/client/coral-admin/src/routes/Moderation/components/StorySearch.js
index 4ceeb4241..65f8a27ac 100644
--- a/client/coral-admin/src/routes/Moderation/components/StorySearch.js
+++ b/client/coral-admin/src/routes/Moderation/components/StorySearch.js
@@ -38,9 +38,11 @@ const StorySearch = (props) => {
             </Button>
           </div>
           <div className={styles.results}>
-            <p className={styles.cta}>
-              <a href={'moderate/all'}>Moderate comments on All Stories</a>
-            </p>
+            {props.assetId &&
+              <div className={styles.cta}>
+                <a onClick={props.goToModerateAll}>Moderate comments on All Stories</a>
+              </div>
+            }
             <div className={styles.storyList}>
 
               {
diff --git a/client/coral-admin/src/routes/Moderation/containers/StorySearch.js b/client/coral-admin/src/routes/Moderation/containers/StorySearch.js
index 2196e8994..f4ab6f23e 100644
--- a/client/coral-admin/src/routes/Moderation/containers/StorySearch.js
+++ b/client/coral-admin/src/routes/Moderation/containers/StorySearch.js
@@ -45,11 +45,18 @@ class StorySearchContainer extends React.Component {
     closeSearch();
   }
 
+  goToModerateAll = () => {
+    const {router, closeSearch} = this.props;
+    router.push('/admin/moderate/all');
+    closeSearch();
+  }
+
   render () {
     return (
       <StorySearch
         search={this.search}
         goToStory={this.goToStory}
+        goToModerateAll={this.goToModerateAll}
         handleEsc={this.handleEsc}
         handleEnter={this.handleEnter}
         searchValue={this.state.searchValue}