diff --git a/static/index.html b/static/index.html
index d8a52d9..7702a46 100644
--- a/static/index.html
+++ b/static/index.html
@@ -33,6 +33,7 @@
         <div class="actions">
           <input type="button" id="run" value="Run Query" class="btn btn-sm btn-primary" />
           <input type="button" id="explain" value="Explain Query" class="btn btn-sm btn-default" />
+          <input type="button" id="csv" value="Download CSV" class="btn btn-sm btn-default" />
 
           <div id="query_progress">Please wait, query is executing...</div>
         </div>
diff --git a/static/js/app.js b/static/js/app.js
index 40ac971..944571d 100644
--- a/static/js/app.js
+++ b/static/js/app.js
@@ -173,6 +173,7 @@ function runQuery() {
 
   $("#run").attr("disabled", "disabled");
   $("#explain").attr("disabled", "disabled");
+  $("#csv").attr("disabled", "disabled");
   $("#query_progress").show();
 
   var query = $.trim(editor.getValue());
@@ -180,6 +181,7 @@ function runQuery() {
   if (query.length == 0) {
     $("#run").removeAttr("disabled");
     $("#explain").removeAttr("disabled");
+    $("#csv").removeAttr("disabled");
     $("#query_progress").hide();
     return;
   }
@@ -200,6 +202,7 @@ function runExplain() {
 
   $("#run").attr("disabled", "disabled");
   $("#explain").attr("disabled", "disabled");
+  $("#csv").attr("disabled", "disabled");
   $("#query_progress").show();
 
   var query = $.trim(editor.getValue());
@@ -207,6 +210,7 @@ function runExplain() {
   if (query.length == 0) {
     $("#run").removeAttr("disabled");
     $("#explain").removeAttr("disabled");
+    $("#csv").removeAttr("disabled");
     $("#query_progress").hide();
     return;
   }
@@ -216,12 +220,32 @@ function runExplain() {
 
     $("#run").removeAttr("disabled");
     $("#explain").removeAttr("disabled");
+    $("#csv").removeAttr("disabled");
     $("#query_progress").hide();
     $("#input").show();
     $("#output").removeClass("full");
   });
 }
 
+function exportToCSV() {
+  setCurrentTab("table_query");
+
+  $("#run").attr("disabled", "disabled");
+  $("#explain").attr("disabled", "disabled");
+  $("#csv").attr("disabled", "disabled");
+  $("#query_progress").show();
+
+  var query = $.trim(editor.getValue());
+
+  if (query.length == 0) {
+    $("#run").removeAttr("disabled");
+    $("#explain").removeAttr("disabled");
+    $("#csv").removeAttr("disabled");
+    $("#query_progress").hide();
+    return;
+  }
+}
+
 var editor;
 
 $(document).ready(function() {
@@ -250,6 +274,10 @@ $(document).ready(function() {
     runExplain();
   });
 
+  $("#csv").on("click", function() {
+    exportToCSV();
+  });
+
   $("#results").on("click", "tr", function() {
     $("#results tr.selected").removeClass();
     $(this).addClass("selected");