diff --git a/app/soapbox/features/admin/user_index.js b/app/soapbox/features/admin/user_index.js
index 3468e3036..4406a0aad 100644
--- a/app/soapbox/features/admin/user_index.js
+++ b/app/soapbox/features/admin/user_index.js
@@ -103,7 +103,6 @@ class UserIndex extends ImmutablePureComponent {
       <Column>
         <SimpleForm style={{ paddingBottom: 0 }}>
           <TextInput
-            value={this.state.q}
             onChange={this.handleQueryChange}
             placeholder={intl.formatMessage(messages.searchPlaceholder)}
           />
diff --git a/app/soapbox/features/compose/containers/search_container.js b/app/soapbox/features/compose/containers/search_container.js
index 3a45b4794..e6484216c 100644
--- a/app/soapbox/features/compose/containers/search_container.js
+++ b/app/soapbox/features/compose/containers/search_container.js
@@ -6,30 +6,41 @@ import {
   showSearch,
 } from '../../../actions/search';
 import Search from '../components/search';
+import { debounce } from 'lodash';
 
 const mapStateToProps = state => ({
   value: state.getIn(['search', 'value']),
   submitted: state.getIn(['search', 'submitted']),
 });
 
-const mapDispatchToProps = dispatch => ({
+const mapDispatchToProps = (dispatch, { autoSubmit }) => {
 
-  onChange(value) {
-    dispatch(changeSearch(value));
-  },
-
-  onClear() {
-    dispatch(clearSearch());
-  },
-
-  onSubmit() {
+  const debouncedSubmit = debounce(() => {
     dispatch(submitSearch());
-  },
+  }, 900);
 
-  onShow() {
-    dispatch(showSearch());
-  },
+  return {
+    onChange(value) {
+      dispatch(changeSearch(value));
 
-});
+      if (autoSubmit) {
+        debouncedSubmit();
+      }
+    },
+
+    onClear() {
+      dispatch(clearSearch());
+    },
+
+    onSubmit() {
+      dispatch(submitSearch());
+    },
+
+    onShow() {
+      dispatch(showSearch());
+    },
+
+  };
+};
 
 export default connect(mapStateToProps, mapDispatchToProps)(Search);
diff --git a/app/soapbox/features/search/index.js b/app/soapbox/features/search/index.js
index 9e6da120d..12c177790 100644
--- a/app/soapbox/features/search/index.js
+++ b/app/soapbox/features/search/index.js
@@ -12,7 +12,7 @@ const messages = defineMessages({
 const Search = ({ intl }) => (
   <div className='column search-page'>
     <ColumnHeader icon='search' title={intl.formatMessage(messages.heading)} />
-    <SearchContainer />
+    <SearchContainer autoSubmit />
     <div className='drawer__pager'>
       <div className='drawer__inner darker'>
         <SearchResultsContainer />