diff --git a/js/apps/system/aardvark/frontend/js/views/queryView.js b/js/apps/system/aardvark/frontend/js/views/queryView.js
index a189940e0a..bc31a30f73 100644
--- a/js/apps/system/aardvark/frontend/js/views/queryView.js
+++ b/js/apps/system/aardvark/frontend/js/views/queryView.js
@@ -580,12 +580,16 @@
       // clear result
       outputEditor.setValue('');
 
-      window.progressView.show(
+      /*window.progressView.show(
         "Query is operating...",
         self.abortQuery("id"),
         '<button class="button-danger">Abort Query</button>'
+      );*/
+      window.progressView.show(
+        "Query is operating..."
       );
 
+
       $.ajax({
         type: "POST",
         url: "/_api/cursor",
@@ -597,9 +601,11 @@
           self.switchTab("result-switch");
           window.progressView.hide();
           self.deselect(outputEditor);
+          $('#downloadQueryResult').show();
         },
         error: function (data) {
           self.switchTab("result-switch");
+          $('#downloadQueryResult').hide();
           try {
             var temp = JSON.parse(data.responseText);
             outputEditor.setValue('[' + temp.errorNum + '] ' + temp.errorMessage);