diff --git a/CHANGELOG.md b/CHANGELOG.md
index b0d0405efb..62b955c05e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 - Add a larger view of a swatch image when option is hovered over on the product page [#923](https://github.com/bigcommerce/stencil/pull/923)
 - Fixes an issue with file upload button not properly displaying in IE [#925](https://github.com/bigcommerce/stencil/pull/925)
 - Make sure product review email links automatically pop the review form [#928](https://github.com/bigcommerce/stencil/pull/928)
+- Fixes an issue where search results would incorrectly state there were no results when there were results visible [#934](https://github.com/bigcommerce/stencil/pull/934)
 
 ## 1.5.2 (2017-02-14)
 - Added a setting to theme editor schema to show/hide the homepage carousel [#909](https://github.com/bigcommerce/stencil/pull/909)
diff --git a/templates/pages/search.html b/templates/pages/search.html
index 308e8a3a4a..eb09351750 100644
--- a/templates/pages/search.html
+++ b/templates/pages/search.html
@@ -73,13 +73,15 @@
                             <a href="{{forms.search.suggested_query.url}}" class="search-refine">{{lang 'forms.search.refine'}}</a>
                         </div>
 
-                        <div class="search-suggestion">
-                            <p>
-                                {{lang 'forms.search.your_search_for'}}
-                                "<strong>{{forms.search.query}}</strong>"
-                                {{lang 'forms.search.no_match'}}
-                            </p>
-                        </div>
+                        {{#if result_count '===' 0}}
+                            <div class="search-suggestion">
+                                <p>
+                                    {{lang 'forms.search.your_search_for'}}
+                                    "<strong>{{forms.search.query}}</strong>"
+                                    {{lang 'forms.search.no_match'}}
+                                </p>
+                            </div>
+                        {{/if}}
                     {{/if}}
 
                     {{#if category_results.length}}