diff --git a/app/assets/javascripts/discourse/controllers/header.js.es6 b/app/assets/javascripts/discourse/controllers/header.js.es6
index 0460830bc..42c8fc851 100644
--- a/app/assets/javascripts/discourse/controllers/header.js.es6
+++ b/app/assets/javascripts/discourse/controllers/header.js.es6
@@ -33,7 +33,7 @@ const HeaderController = Ember.Controller.extend({
       var params = "";
 
       if (context) {
-        params = `?context=${context.type}&context_id=${context.id}`;
+        params = `?context=${context.type}&context_id=${context.id}&skip_context=true`;
       }
 
       DiscourseURL.routeTo('/search' + params);
diff --git a/app/assets/javascripts/discourse/routes/full-page-search.js.es6 b/app/assets/javascripts/discourse/routes/full-page-search.js.es6
index 9c95de0aa..3cda47e9a 100644
--- a/app/assets/javascripts/discourse/routes/full-page-search.js.es6
+++ b/app/assets/javascripts/discourse/routes/full-page-search.js.es6
@@ -1,7 +1,7 @@
 import { translateResults, getSearchKey, isValidSearchTerm } from "discourse/lib/search";
 
 export default Discourse.Route.extend({
-  queryParams: { q: {}, context_id: {}, context: {} },
+  queryParams: { q: {}, context_id: {}, context: {}, skip_context: {} },
 
   model(params) {
     const router = Discourse.__container__.lookup('router:main');