diff --git a/app/helpers/application_helper/button/basic.rb b/app/helpers/application_helper/button/basic.rb
index a5e429ff033..410b4adce0c 100644
--- a/app/helpers/application_helper/button/basic.rb
+++ b/app/helpers/application_helper/button/basic.rb
@@ -11,7 +11,7 @@ def initialize(view_context, view_binding, instance_data, props)
   end
 
   def calculate_properties
-    self[:enabled] = !disabled?
+    self[:enabled] = !disabled? if self[:enabled].nil?
   end
 
   def skip?
diff --git a/app/helpers/application_helper/button/report_download_choice.rb b/app/helpers/application_helper/button/report_download_choice.rb
new file mode 100644
index 00000000000..3ab104bbfdc
--- /dev/null
+++ b/app/helpers/application_helper/button/report_download_choice.rb
@@ -0,0 +1,5 @@
+class ApplicationHelper::Button::ReportDownloadChoice < ApplicationHelper::Button::Basic
+  def disabled?
+    MiqReportResult.find(@report_result_id).try(:miq_report_result_details).try(:length).to_i == 0
+  end
+end
diff --git a/app/helpers/application_helper/toolbar/report_view.rb b/app/helpers/application_helper/toolbar/report_view.rb
index 9d355dadd50..5727bb1826d 100644
--- a/app/helpers/application_helper/toolbar/report_view.rb
+++ b/app/helpers/application_helper/toolbar/report_view.rb
@@ -28,6 +28,7 @@ class ApplicationHelper::Toolbar::ReportView < ApplicationHelper::Toolbar::Basic
       'fa fa-download fa-lg',
       N_('Download'),
       nil,
+      :klass => ApplicationHelper::Button::ReportDownloadChoice,
       :items => [
         button(
           :render_report_txt,