diff --git a/app/controllers/concerns/saved_searches/check_availability.rb b/app/controllers/concerns/saved_searches/check_availability.rb
new file mode 100644
index 000000000..0a1690438
--- /dev/null
+++ b/app/controllers/concerns/saved_searches/check_availability.rb
@@ -0,0 +1,25 @@
+module SavedSearches
+  module CheckAvailability
+    extend ActiveSupport::Concern
+
+    included do
+      before_filter :check_availability
+    end
+
+    def check_availability
+      if !SavedSearch.enabled?
+        respond_to do |format|
+          format.html do
+            flash[:notice] = "Listbooru service is not configured. Saved searches are not available."
+            redirect_to :back
+          end
+          format.json do
+            render json: {success: false, reason: "Listbooru service is not configured"}.to_json, status: 501
+          end
+        end
+
+        return false
+      end
+    end
+  end
+end
diff --git a/app/controllers/saved_search_category_changes_controller.rb b/app/controllers/saved_search_category_changes_controller.rb
index ef38de940..e9aaf5290 100644
--- a/app/controllers/saved_search_category_changes_controller.rb
+++ b/app/controllers/saved_search_category_changes_controller.rb
@@ -1,6 +1,7 @@
 class SavedSearchCategoryChangesController < ApplicationController
+  include SavedSearches::CheckAvailability
+
   before_filter :member_only
-  before_filter :check_availabililty
   respond_to :html
 
   def new
@@ -12,22 +13,4 @@ class SavedSearchCategoryChangesController < ApplicationController
     flash[:notice] = "Saved searches will be renamed"
     redirect_to saved_searches_path
   end
-
-private
-  
-  def check_availabililty
-    if !SavedSearch.enabled?
-      respond_to do |format|
-        format.html do
-          flash[:notice] = "Listbooru service is not configured. Saved searches are not available."
-          redirect_to :back
-        end
-        format.json do
-          render json: {success: false, reason: "Listbooru service is not configured"}.to_json, status: 501
-        end
-      end
-
-      return false
-    end
-  end
 end
diff --git a/app/controllers/saved_searches_controller.rb b/app/controllers/saved_searches_controller.rb
index 128889aa0..7e1d96c6c 100644
--- a/app/controllers/saved_searches_controller.rb
+++ b/app/controllers/saved_searches_controller.rb
@@ -1,6 +1,7 @@
 class SavedSearchesController < ApplicationController
+  include SavedSearches::CheckAvailability
+
   before_filter :member_only
-  before_filter :check_availability
   respond_to :html, :xml, :json, :js
   
   def index
@@ -47,23 +48,6 @@ class SavedSearchesController < ApplicationController
   end
 
 private
-
-  def check_availabililty
-    if !SavedSearch.enabled?
-      respond_to do |format|
-        format.html do
-          flash[:notice] = "Listbooru service is not configured. Saved searches are not available."
-          redirect_to :back
-        end
-        format.json do
-          render json: {success: false, reason: "Listbooru service is not configured"}.to_json, status: 501
-        end
-      end
-
-      return false
-    end
-  end
-
   def saved_searches
     CurrentUser.user.saved_searches
   end