diff --git a/app/views/settings/_dmsf_columns.html.erb b/app/views/settings/_dmsf_columns.html.erb
index 2b128ca6..9526bf51 100644
--- a/app/views/settings/_dmsf_columns.html.erb
+++ b/app/views/settings/_dmsf_columns.html.erb
@@ -26,14 +26,19 @@
   <% columns.concat(extra_columns) if defined?(extra_columns) %>
   <% index = columns.index(l(:field_project)) %>
   <%# Move Project to the second position %>
-  <% if index %>
+    <% if index %>
     <% columns.insert(0, columns.delete_at(index)) %>
   <% end %>
   <% cfs = DmsfFileRevisionCustomField.visible.order(:position) %>
-  <% columns.concat(cfs.map{ |c| c.name }) %>
   <% selected_columns = DmsfFolder::DEFAULT_COLUMNS if selected_columns.blank? %>
   <% columns.each_with_index do |column, i| %>
     <%= check_box_tag 'settings[dmsf_columns][]', column, selected_columns.include?(column), id: "dmsf_column_#{i}" %>
+    <%= l("label_column_#{column}").capitalize %>
+    <br/>
+  <% end %>
+  <% columns = cfs.map{ |c| c.name }
+     columns.each_with_index do |column, i| %>
+    <%= check_box_tag 'settings[dmsf_columns][]', column, selected_columns.include?(column), id: "dmsf_column_#{i}" %>
     <%= h column.capitalize %>
     <br/>
   <% end %>