diff --git a/app/controllers/subjects_controller.rb b/app/controllers/subjects_controller.rb
index <HASH>..<HASH> 100644
--- a/app/controllers/subjects_controller.rb
+++ b/app/controllers/subjects_controller.rb
@@ -2,7 +2,7 @@
 class SubjectsController < ApplicationController
   load_and_authorize_resource :except => :index
   authorize_resource :only => :index
-  before_filter :prepare_options, :only => :new
+  before_filter :prepare_options, :only => [:new, :edit]
   after_filter :solr_commit, :only => [:create, :update, :destroy]
   cache_sweeper :subject_sweeper, :only => [:create, :update, :destroy]
fixed setting subject_types next-l/enju_leaf#<I>