diff --git a/app/soapbox/features/compose/components/search_results.js b/app/soapbox/features/compose/components/search_results.js
index e6004e4a3..58198eac4 100644
--- a/app/soapbox/features/compose/components/search_results.js
+++ b/app/soapbox/features/compose/components/search_results.js
@@ -45,9 +45,9 @@ export default class SearchResults extends ImmutablePureComponent {
 
       if (results.get('accounts') && results.get('accounts').size > 0) {
         searchResults = results.get('accounts').map(accountId => <AccountContainer key={accountId} id={accountId} />);
-      } else if (suggestions && !suggestions.isEmpty()) {
+      } else if (!submitted && suggestions && !suggestions.isEmpty()) {
         searchResults = suggestions.map(suggestion => <AccountContainer key={suggestion.get('account')} id={suggestion.get('account')} />);
-      } else if (submitted) {
+      } else if (loaded) {
         noResultsMessage = (
           <div className='empty-column-indicator'>
             <FormattedMessage
diff --git a/app/styles/components/search.scss b/app/styles/components/search.scss
index b3e56eaac..db0605185 100644
--- a/app/styles/components/search.scss
+++ b/app/styles/components/search.scss
@@ -165,11 +165,6 @@ input.search__input {
   border-bottom: none;
 }
 
-.search-page {
-  height: 100%;
-  min-height: 140px;
-}
-
 .column {
   .search {
     padding: 10px 15px;