diff --git a/js/forum/src/components/Search.js b/js/forum/src/components/Search.js
index 396fe1dd4..5996403ca 100644
--- a/js/forum/src/components/Search.js
+++ b/js/forum/src/components/Search.js
@@ -93,9 +93,13 @@ export default class Search extends Component {
               ? <button className="Search-clear Button Button--icon Button--link" onclick={this.clear.bind(this)}>{icon('times-circle')}</button>
               : ''}
         </div>
-        <ul className="Dropdown-menu Search-results">
-          {this.sources.map(source => source.view(this.value()))}
-        </ul>
+        {this.value() && this.hasFocus
+          ? (
+            <ul className="Dropdown-menu Search-results">
+              {this.sources.map(source => source.view(this.value()))}
+            </ul>
+          )
+          : ''}
       </div>
     );
   }