diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index c6cfcf31652..23872ed5606 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -807,7 +807,7 @@ class ApplicationController < ActionController::Base
   end
 
   def add_noindex_header
-    response.headers['X-Robots-Tag'] = 'noindex'
+    response.headers['X-Robots-Tag'] = 'noindex' if request.get?
   end
 
   protected
diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index 3f0914e2dce..a2dd66ea5f4 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -2,9 +2,9 @@
 
 class SearchController < ApplicationController
 
-  skip_before_action :check_xhr, only: :show
-
   before_action :cancel_overloaded_search, only: [:query]
+  skip_before_action :check_xhr, only: :show
+  after_action :add_noindex_header
 
   def self.valid_context_types
     %w{user topic category private_messages tag}