1 files changed, 3 insertions, 2 deletions
diff --git a/redmine/app/controllers/custom_fields_controller.rb b/redmine/app/controllers/custom_fields_controller.rb
index d0ffddf7f..bfa152fd1 100644
--- a/redmine/app/controllers/custom_fields_controller.rb
+++ b/redmine/app/controllers/custom_fields_controller.rb
@@ -21,11 +21,12 @@ class CustomFieldsController < ApplicationController
 
   def index
     list
-    render :action => 'list'
+    render :action => 'list' unless request.xhr?
   end
 
   def list
-    @custom_field_pages, @custom_fields = paginate :custom_fields, :per_page => 15
+    @custom_field_pages, @custom_fields = paginate :custom_fields, :per_page => 15
+    render :action => "list", :layout => false if request.xhr?
   end
   
   def new