1 files changed, 15 insertions, 6 deletions

diff --git a/web/react/components/search_results.jsx b/web/react/components/search_results.jsx
index 30e15d0ad..b56a7b006 100644
--- a/web/react/components/search_results.jsx
+++ b/web/react/components/search_results.jsx
@@ -1,7 +1,7 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var PostStore = require('../stores/post_store.jsx');
+var SearchStore = require('../stores/search_store.jsx');
 var UserStore = require('../stores/user_store.jsx');
 var SearchBox = require('./search_bar.jsx');
 var Utils = require('../utils/utils.jsx');
@@ -9,7 +9,7 @@ var SearchResultsHeader = require('./search_results_header.jsx');
 var SearchResultsItem = require('./search_results_item.jsx');
 
 function getStateFromStores() {
-    return {results: PostStore.getSearchResults()};
+    return {results: SearchStore.getSearchResults()};
 }
 
 export default class SearchResults extends React.Component {
@@ -30,7 +30,7 @@ export default class SearchResults extends React.Component {
 
     componentDidMount() {
         this.mounted = true;
-        PostStore.addSearchChangeListener(this.onChange);
+        SearchStore.addSearchChangeListener(this.onChange);
         this.resize();
         window.addEventListener('resize', this.handleResize);
     }
@@ -40,7 +40,7 @@ export default class SearchResults extends React.Component {
     }
 
     componentWillUnmount() {
-        PostStore.removeSearchChangeListener(this.onChange);
+        SearchStore.removeSearchChangeListener(this.onChange);
         this.mounted = false;
         window.removeEventListener('resize', this.handleResize);
     }
@@ -78,12 +78,21 @@ export default class SearchResults extends React.Component {
             searchForm = <SearchBox />;
         }
         var noResults = (!results || !results.order || !results.order.length);
-        var searchTerm = PostStore.getSearchTerm();
+        var searchTerm = SearchStore.getSearchTerm();
 
         var ctls = null;
 
         if (noResults) {
-            ctls = <div className='sidebar--right__subheader'>No results</div>;
+            ctls =
+            (
+                <div className='sidebar--right__subheader'>
+                    <h4>{'NO RESULTS'}</h4>
+                    <ul>
+                        <li>If you're searching a partial phrase (ex. searching "rea", looking for "reach" or "reaction"), append a * to your search term</li>
+                        <li>Due to the volume of results, two letter searches and common words like "this", "a" and "is" won't appear in search results</li>
+                    </ul>
+                </div>
+            );
         } else {
             ctls = results.order.map(function mymap(id) {
                 var post = results.posts[id];