diff --git a/client/coral-admin/src/actions/moderation.js b/client/coral-admin/src/actions/moderation.js
index a684c6085..08dadd8ee 100644
--- a/client/coral-admin/src/actions/moderation.js
+++ b/client/coral-admin/src/actions/moderation.js
@@ -61,6 +61,6 @@ export const storySearchChange = (value) => ({
   value
 });
 
-export const storySearchClear = () => ({
-  type: actions.STORY_SEARCH_CLEAR
+export const clearState = () => ({
+  type: actions.MODERATION_CLEAR_STATE
 });
diff --git a/client/coral-admin/src/constants/moderation.js b/client/coral-admin/src/constants/moderation.js
index fec6b2353..6fefcccfb 100644
--- a/client/coral-admin/src/constants/moderation.js
+++ b/client/coral-admin/src/constants/moderation.js
@@ -15,4 +15,4 @@ export const CLEAR_USER_DETAIL_SELECTIONS = 'CLEAR_USER_DETAIL_SELECTIONS';
 export const SHOW_STORY_SEARCH = 'SHOW_STORY_SEARCH';
 export const HIDE_STORY_SEARCH = 'HIDE_STORY_SEARCH';
 export const STORY_SEARCH_CHANGE_VALUE = 'STORY_SEARCH_CHANGE_VALUE';
-export const STORY_SEARCH_CLEAR = 'STORY_SEARCH_CLEAR';
+export const MODERATION_CLEAR_STATE = 'MODERATION_CLEAR_STATE';
diff --git a/client/coral-admin/src/reducers/moderation.js b/client/coral-admin/src/reducers/moderation.js
index 858986e45..fd6f7c0ea 100644
--- a/client/coral-admin/src/reducers/moderation.js
+++ b/client/coral-admin/src/reducers/moderation.js
@@ -27,6 +27,8 @@ const initialState = fromJS({
 
 export default function moderation (state = initialState, action) {
   switch (action.type) {
+  case actions.MODERATION_CLEAR_STATE:
+    return initialState;
   case actions.HIDE_BANUSER_DIALOG:
     return state
       .set('banDialog', false)
@@ -88,8 +90,6 @@ export default function moderation (state = initialState, action) {
     return state.set('storySearchVisible', false);
   case actions.STORY_SEARCH_CHANGE_VALUE:
     return state.set('storySearchString', action.value);
-  case actions.STORY_SEARCH_CLEAR:
-    return state.set('storySearchString', '');
   case actions.SET_SORT_ORDER:
     return state.set('sortOrder', action.order);
   default :
diff --git a/client/coral-admin/src/routes/Community/components/styles.css b/client/coral-admin/src/routes/Community/components/styles.css
index 8e4b716af..8581c4c7d 100644
--- a/client/coral-admin/src/routes/Community/components/styles.css
+++ b/client/coral-admin/src/routes/Community/components/styles.css
@@ -91,6 +91,7 @@ span {
 
   .moderateAsset {
     a {
+      text-align: center;
       -webkit-box-flex: 1;
       -ms-flex: 1;
       flex: 1;
@@ -103,21 +104,9 @@ span {
       opacity: 1;
 
       &:hover {
-          opacity: .8;
+         opacity: .8;
          cursor: pointer;
       }
-
-      &:first-child {
-        text-align: left;
-      }
-
-      &:nth-child(2) {
-       text-align: center;
-      }
-
-      &:last-child {
-        text-align: right;
-      }
     }
   }
 }
diff --git a/client/coral-admin/src/routes/Moderation/components/Moderation.js b/client/coral-admin/src/routes/Moderation/components/Moderation.js
index 05e035e2e..59a5a70e7 100644
--- a/client/coral-admin/src/routes/Moderation/components/Moderation.js
+++ b/client/coral-admin/src/routes/Moderation/components/Moderation.js
@@ -34,9 +34,8 @@ export default class Moderation extends Component {
   }
 
   closeSearch = () => {
-    const {storySearchClear, toggleStorySearch} = this.props;
+    const {toggleStorySearch} = this.props;
     toggleStorySearch(false);
-    storySearchClear();
   }
 
   openSearch = () => {
diff --git a/client/coral-admin/src/routes/Moderation/components/ModerationHeader.js b/client/coral-admin/src/routes/Moderation/components/ModerationHeader.js
index 0ab2eb762..9e50f4dbb 100644
--- a/client/coral-admin/src/routes/Moderation/components/ModerationHeader.js
+++ b/client/coral-admin/src/routes/Moderation/components/ModerationHeader.js
@@ -9,10 +9,6 @@ const ModerationHeader = ({asset, searchVisible, openSearch, closeSearch}) => {
   const trigger = searchVisible ? closeSearch : openSearch;
   const searchTriggerIcon = <Icon className={styles.searchTrigger} name={searchVisible ? 'arrow_drop_up' : 'arrow_drop_down'} />;
 
-  const allStreams = asset
-    ? <Link className="mdl-tabs__tab" to="/admin/moderate">{t('modqueue.all_streams')}</Link>
-    : <a className="mdl-tabs__tab" />;
-
   const title = asset
     ? <a onClick={trigger} className="mdl-tabs__tab">{asset.title} {searchTriggerIcon}</a>
     : <a onClick={trigger} className="mdl-tabs__tab">{t('modqueue.all_streams')} {searchTriggerIcon}</a>;
@@ -21,9 +17,7 @@ const ModerationHeader = ({asset, searchVisible, openSearch, closeSearch}) => {
     <div className=''>
       <div className={`mdl-tabs ${styles.header}`}>
         <div className={`mdl-tabs__tab-bar ${styles.moderateAsset}`}>
-          {allStreams}
           {title}
-          <Link className="mdl-tabs__tab" to="/admin/stories">{t('modqueue.select_stream')}</Link>
         </div>
       </div>
     </div>
diff --git a/client/coral-admin/src/routes/Moderation/components/StorySearch.js b/client/coral-admin/src/routes/Moderation/components/StorySearch.js
index 0e99e1e9e..38f8057db 100644
--- a/client/coral-admin/src/routes/Moderation/components/StorySearch.js
+++ b/client/coral-admin/src/routes/Moderation/components/StorySearch.js
@@ -30,7 +30,8 @@ const StorySearch = (props) => {
           <input
             className={styles.searchInput}
             onChange={props.handleSearchChange}
-            value={props.moderation.storySearchString}
+            onKeyDown={props.handleEnter}
+            value={props.searchValue}
           />
           <Button
             cStyle='blue'
diff --git a/client/coral-admin/src/routes/Moderation/components/styles.css b/client/coral-admin/src/routes/Moderation/components/styles.css
index b14e656f5..9fa343762 100644
--- a/client/coral-admin/src/routes/Moderation/components/styles.css
+++ b/client/coral-admin/src/routes/Moderation/components/styles.css
@@ -116,29 +116,20 @@ span {
       transition: background-color 200ms;
       opacity: 1;
 
-      &:first-child {
-        text-align: left;
+      &:hover {
+         cursor: pointer;
+         background-color: #212121;
+      }
+      span {
+        text-align: center;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        overflow: hidden;
+        max-width: 344px;
+        display: inline-block;
+        vertical-align: top;
       }
 
-      &:nth-child(2) {
-        &:hover {
-           cursor: pointer;
-           background-color: #212121;
-        }
-        span {
-          text-align: center;
-          text-overflow: ellipsis;
-          white-space: nowrap;
-          overflow: hidden;
-          max-width: 344px;
-          display: inline-block;
-          vertical-align: top;
-        }
-      }
-
-      &:last-child {
-        text-align: right;
-      }
     }
   }
 }
diff --git a/client/coral-admin/src/routes/Moderation/containers/Moderation.js b/client/coral-admin/src/routes/Moderation/containers/Moderation.js
index eedb1271f..e60a6b914 100644
--- a/client/coral-admin/src/routes/Moderation/containers/Moderation.js
+++ b/client/coral-admin/src/routes/Moderation/containers/Moderation.js
@@ -26,7 +26,7 @@ import {
   hideUserDetail,
   setSortOrder,
   storySearchChange,
-  storySearchClear
+  clearState
 } from 'actions/moderation';
 
 import {Spinner} from 'coral-ui';
@@ -35,6 +35,7 @@ import Comment from './Comment';
 
 class ModerationContainer extends Component {
   componentWillMount() {
+    this.props.clearState();
     this.props.fetchSettings();
   }
 
@@ -309,7 +310,7 @@ const mapDispatchToProps = (dispatch) => ({
     hideUserDetail,
     setSortOrder,
     storySearchChange,
-    storySearchClear
+    clearState
   }, dispatch),
 });
 
diff --git a/client/coral-admin/src/routes/Moderation/containers/StorySearch.js b/client/coral-admin/src/routes/Moderation/containers/StorySearch.js
index 8b5cb3243..c7c3863db 100644
--- a/client/coral-admin/src/routes/Moderation/containers/StorySearch.js
+++ b/client/coral-admin/src/routes/Moderation/containers/StorySearch.js
@@ -4,10 +4,19 @@ import StorySearch from '../components/StorySearch';
 import withQuery from 'coral-framework/hocs/withQuery';
 
 class StorySearchContainer extends React.Component {
+  constructor(props) {
+    super(props);
+
+    this.state = {
+      searchValue: props.moderation.storySearchString
+    };
+  }
 
   handleSearchChange = (e) => {
-    const value = e.target.value;
-    this.props.storySearchChange(value);
+    const {value} = e.target;
+    this.setState({
+      searchValue: value
+    });
   }
 
   handleEnter = (e) => {
@@ -18,15 +27,17 @@ class StorySearchContainer extends React.Component {
   }
 
   search = () => {
-    this.props.data.refetch();
+    const {searchValue} = this.state;
+    this.props.storySearchChange(searchValue);
   }
 
   render () {
     return (
       <StorySearch
         search={this.search}
+        searchValue={this.state.searchValue}
+        handleEnter={this.handleEnter}
         handleSearchChange={this.handleSearchChange}
-        onKeyDownHandler={this.handleEnter}
         {...this.props}
       />
     );
diff --git a/yarn.lock b/yarn.lock
index 6013a3e49..fe99eec83 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5064,7 +5064,7 @@ longest@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097"
 
-loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.2.0:
+loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.2.0, loose-envify@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.3.1.tgz#d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848"
   dependencies:
@@ -6575,6 +6575,13 @@ prop-types@^15.5.0, prop-types@^15.5.4, prop-types@^15.5.6, prop-types@^15.5.7,
   dependencies:
     fbjs "^0.8.9"
 
+prop-types@^15.5.10:
+  version "15.5.10"
+  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.5.10.tgz#2797dfc3126182e3a95e3dfbb2e893ddd7456154"
+  dependencies:
+    fbjs "^0.8.9"
+    loose-envify "^1.3.1"
+
 protocols@^1.1.0, protocols@^1.4.0:
   version "1.4.5"
   resolved "https://registry.yarnpkg.com/protocols/-/protocols-1.4.5.tgz#21de1f441c4ef7094408ed9f1c94f7a114b87557"