diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb
index c4719569d..a0ad8b5e7 100644
--- a/app/views/issues/index.html.erb
+++ b/app/views/issues/index.html.erb
@@ -47,11 +47,21 @@
     <label><%= radio_button_tag 'c[]', '', true %> <%= l(:description_selected_columns) %></label><br />
     <label><%= radio_button_tag 'c[]', 'all_inline' %> <%= l(:description_all_columns) %></label>
   </p>
-  <p>
+  <p id="csv-export-block-columns">
     <% @query.available_block_columns.each do |column| %>
-      <label><%= check_box_tag 'c[]', column.name, @query.has_column?(column) %> <%= column.caption %></label>
+      <label><%= check_box_tag 'c[]', column.name, @query.has_column?(column), :id => nil %> <%= column.caption %></label>
     <% end %>
   </p>
+  <%= javascript_tag do %>
+  $(function(){
+    $('input[type="radio"][value="all_inline"]').click(function(){
+      var block_columns = $('#csv-export-block-columns input[type="checkbox"]');
+      if(block_columns.length && !block_columns.is(':checked')){
+        block_columns.prop('checked', true);
+      }
+    });
+  });
+  <% end %>
   <%= export_csv_encoding_select_tag %>
   <% if @issue_count > Setting.issues_export_limit.to_i %>
   <p class="icon icon-warning">
diff --git a/app/views/timelog/index.html.erb b/app/views/timelog/index.html.erb
index f60b51064..8ee8e4fe7 100644
--- a/app/views/timelog/index.html.erb
+++ b/app/views/timelog/index.html.erb
@@ -40,11 +40,21 @@
     <label><%= radio_button_tag 'c[]', '', true %> <%= l(:description_selected_columns) %></label><br />
     <label><%= radio_button_tag 'c[]', 'all_inline' %> <%= l(:description_all_columns) %></label>
   </p>
-  <p>
+  <p id="csv-export-block-columns">
     <% @query.available_block_columns.each do |column| %>
-      <label><%= check_box_tag 'c[]', column.name, @query.has_column?(:column) %> <%= column.caption %></label>
+      <label><%= check_box_tag 'c[]', column.name, @query.has_column?(:column), :id => nil %> <%= column.caption %></label>
     <% end %>
   </p>
+  <%= javascript_tag do %>
+  $(function(){
+    $('input[type="radio"][value="all_inline"]').click(function(){
+      var block_columns = $('#csv-export-block-columns input[type="checkbox"]');
+      if(block_columns.length && !block_columns.is(':checked')){
+        block_columns.prop('checked', true);
+      }
+    });
+  });
+  <% end %>
   <%= export_csv_encoding_select_tag %>
   <p class="buttons">
     <%= submit_tag l(:button_export), :name => nil, :onclick => "hideModal(this);", :data => { :disable_with => false } %>