diff --git a/app/assets/javascripts/app/views/generic/column_select.jst.eco b/app/assets/javascripts/app/views/generic/column_select.jst.eco
index a5072fc3f..81a8a99d8 100644
--- a/app/assets/javascripts/app/views/generic/column_select.jst.eco
+++ b/app/assets/javascripts/app/views/generic/column_select.jst.eco
@@ -18,7 +18,7 @@
 <div class="columnSelect-column columnSelect-column--selected js-selected" data-name="<%= @attribute.name %>">
   <div class="u-placeholder u-unselectable js-placeholder<%= ' is-hidden' if @values.length %>"><%- @T('Nothing selected') %></div>
   <% for option in @allOptions: %>
-  <div class="columnSelect-option js-remove js-option<%= ' is-hidden' if !option.selected %>" data-value="<%= option.value %>"><%= option.name %></div>
+  <div class="columnSelect-option js-remove js-option<%= ' is-hidden' if !option.selected %>" data-value="<%= option.value %>" title="<%= option.title || option.name %>"><%= option.name %></div>
   <% end %>
 </div>
 <div class="columnSelect-column columnSelect-column--sidebar" data-name="<%= @attribute.name %>">
@@ -36,10 +36,10 @@
       <% if option.group != undefined: %>
         <div class="columnSelect-group-label" title="<%= @T(option.label) %>"><%= @T(option.label) %></div>
         <% for o in option.group: %>
-        <div class="columnSelect-option js-select js-option<%= ' is-hidden' if o.selected %>" data-value="<%= o.value %>" title="<%= o.title %>"><%= o.name %></div>
+        <div class="columnSelect-option js-select js-option<%= ' is-hidden' if o.selected %>" data-value="<%= o.value %>" title="<%= o.title || o.name %>"><%= o.name %></div>
         <% end %>
       <% else: %>
-        <div class="columnSelect-option js-select js-option<%= ' is-hidden' if option.selected %>" data-value="<%= option.value %>" title="<%= option.title %>"><%= option.name %></div>
+        <div class="columnSelect-option js-select js-option<%= ' is-hidden' if option.selected %>" data-value="<%= option.value %>" title="<%= option.title || option.name %>"><%= option.name %></div>
       <% end %>
     <% end %>
   </div>