diff --git a/app/assets/javascripts/discourse/controllers/search.js.es6 b/app/assets/javascripts/discourse/controllers/search.js.es6
index ce28c5b73f1..2bf81830419 100644
--- a/app/assets/javascripts/discourse/controllers/search.js.es6
+++ b/app/assets/javascripts/discourse/controllers/search.js.es6
@@ -88,7 +88,7 @@ export default Em.Controller.extend(Presence, {
 
   actions: {
     moreOfType: function(type) {
-      if (type === 'topic' && this.get('searchContext.type') !== 'topic') {
+      if (type === 'topic' && (!this.get('searchContextEnabled') || this.get('searchContext.type') !== 'topic')) {
         var term = this.get('term');
         // TODO in topic and in category special handling
         Discourse.URL.routeTo("/search?q=" + encodeURIComponent(term));