diff --git a/app/assets/javascripts/application/charts.coffee b/app/assets/javascripts/application/charts.coffee
index d0e4909b07521d28b9a8ee463481c1b901f1b673..db1964c747206249ebd6cb84dfefd258b0fb70b0 100644
--- a/app/assets/javascripts/application/charts.coffee
+++ b/app/assets/javascripts/application/charts.coffee
@@ -146,12 +146,11 @@ loadChart = (element, chart_config, query_string, view_string) ->
       chart_config['data'] = transform(data, view_string)
       context = element.getContext('2d')
       download_csv_path = $('#download-csv-path').val()
+      query_params = {query: query_string, name: view_string}
+      download_url = "#{download_csv_path}?#{$.param(query_params)}"
       $(element).parent().prepend(
-        "<form action='#{download_csv_path}' method='post'>" +
-          "<input type='hidden' value='#{query_string}' name='query'>" +
-          "<input type='hidden' value='#{view_string}' name='name'>" +
-          "<input type='submit' value='Download CSV'></form>" +
-          " (This CSV always includes data within 2 years regardless which charts)"
+        "<a class='btn btn-secondary' href='#{download_url}' download='#{view_string}.csv'>Download CSV</a>" +
+        " (This CSV always includes data within 2 years regardless which charts)"
       )
       chart = new Chart(context, chart_config)
     async: true
diff --git a/app/controllers/raw_data_controller.rb b/app/controllers/raw_data_controller.rb
index 232942f3b4cd91667c77b7dc9d284aaea4edf54e..4f6f468444787486df6b0ac10cb1cd2ad5f2aec5 100644
--- a/app/controllers/raw_data_controller.rb
+++ b/app/controllers/raw_data_controller.rb
@@ -8,7 +8,7 @@ class RawDataController < ApplicationController
   def download
     respond_to do |format|
       format.csv do
-        send_data csv_data, filename: "#{params[:name]}.csv"
+        send_data csv_data
       end
     end
   end
diff --git a/config/routes.rb b/config/routes.rb
index b00ab133b16270c1bd6d7255f8cc57adfabd66b2..523c7d79504da74272b7a97e3297d02b1011691e 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -44,7 +44,7 @@ Rails.application.routes.draw do
   end
 
   post "/graphql", to: "graphql#execute", as: "graphql"
-  post "/download/raw.:format", to: "raw_data#download", as: "download_raw_data"
+  get "/download/raw.:format", to: "raw_data#download", as: "download_raw_data"
   # The priority is based upon order of creation: first created -> highest priority.
   # See how all your routes lay out with "rake routes".