diff --git a/app/models/custom_field_enumeration.rb b/app/models/custom_field_enumeration.rb
index 4947043e4..3ddf106a7 100644
--- a/app/models/custom_field_enumeration.rb
+++ b/app/models/custom_field_enumeration.rb
@@ -21,7 +21,7 @@ class CustomFieldEnumeration < ApplicationRecord
   belongs_to :custom_field
 
   validates_presence_of :name, :position, :custom_field_id
-  validates_length_of :name, :maximum => 60
+  validates_length_of :name, :maximum => 255
   validates_numericality_of :position, :only_integer => true
   before_create :set_position
 
diff --git a/app/views/custom_field_enumerations/index.html.erb b/app/views/custom_field_enumerations/index.html.erb
index bd6651218..e3ce3c428 100644
--- a/app/views/custom_field_enumerations/index.html.erb
+++ b/app/views/custom_field_enumerations/index.html.erb
@@ -8,7 +8,7 @@
     <li>
       <%= tag.span(sprite_icon('reorder', ''), :class => 'icon-only icon-sort-handle sort-handle', :title => l(:button_move)) %>
       <%= hidden_field_tag "custom_field_enumerations[#{value.id}][position]", position, :class => 'position' %>
-      <%= text_field_tag "custom_field_enumerations[#{value.id}][name]", value.name, :size => 40 %>
+      <%= text_field_tag "custom_field_enumerations[#{value.id}][name]", value.name, :size => 40, :maxlength => 255 %>
       <%= hidden_field_tag "custom_field_enumerations[#{value.id}][active]", 0 %>
       <label>
         <%= check_box_tag "custom_field_enumerations[#{value.id}][active]", 1, value.active? %>
@@ -29,7 +29,7 @@
 <%= form_tag custom_field_enumerations_path(@custom_field), :method => 'post', :remote => true, id: 'add-element' do %>
   <p><%= l(:label_enumeration_new) %></p>
 
-  <p><%= text_field_tag 'custom_field_enumeration[name]', '', :size => 40 %>
+  <p><%= text_field_tag 'custom_field_enumeration[name]', '', :size => 40, :maxlength => 255 %>
   <%= submit_tag(l(:button_add)) %></p>
 <% end %>
 
diff --git a/test/unit/custom_field_enumeration_test.rb b/test/unit/custom_field_enumeration_test.rb
new file mode 100644
index 000000000..268322eea
--- /dev/null
+++ b/test/unit/custom_field_enumeration_test.rb
@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+# Redmine - project management software
+# Copyright (C) 2006-  Jean-Philippe Lang
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+require_relative '../test_helper'
+
+class CustomFieldEnumerationTest < ActiveSupport::TestCase
+  def setup
+    User.current = nil
+    @field = IssueCustomField.create!(:name => 'List', :field_format => 'enumeration', :is_required => false)
+  end
+
+  def test_name_should_accept_255_characters
+    enumeration = @field.enumerations.build(:name => 'a' * 255)
+    assert enumeration.save
+    assert_equal 'a' * 255, enumeration.reload.name
+  end
+end