diff --git a/resources/views/reports/chart_builder.blade.php b/resources/views/reports/chart_builder.blade.php
index 874bb025218f..e349d09cfd5d 100644
--- a/resources/views/reports/chart_builder.blade.php
+++ b/resources/views/reports/chart_builder.blade.php
@@ -119,7 +119,7 @@
                             </div>
                         </div>
 
-						<div id="statusField" style="display:{{ in_array($reportType, [ENTITY_INVOICE, ENTITY_PRODUCT]) ? 'block' : 'none' }}">
+						<div id="statusField" style="display:none">
 							{!! Former::select('invoice_status')->label('status')
 									->addOption(trans('texts.status_all'), 'all')
 									->addOption(trans('texts.status_draft'), 'draft')
@@ -128,7 +128,7 @@
 									->addOption(trans('texts.status_paid'), 'paid') !!}
 						</div>
 
-						<div id="dateField" style="display:{{ $reportType == ENTITY_TAX_RATE ? 'block' : 'none' }}">
+						<div id="dateField" style="display:none">
                             {!! Former::select('date_field')->label(trans('texts.filter'))
                                     ->addOption(trans('texts.invoice_date'), FILTER_INVOICE_DATE)
                                     ->addOption(trans('texts.payment_date'), FILTER_PAYMENT_DATE) !!}
@@ -264,6 +264,20 @@
         $('#action').val('');
     }
 
+	function setFiltersShown() {
+		var val = $('#report_type').val();
+		if (val == '{{ ENTITY_TAX_RATE }}') {
+			$('#dateField').fadeIn();
+		} else {
+			$('#dateField').fadeOut();
+		}
+		if (val == '{{ ENTITY_INVOICE }}' || val == '{{ ENTITY_PRODUCT }}') {
+			$('#statusField').fadeIn();
+		} else {
+			$('#statusField').fadeOut();
+		}
+	}
+
 	var sumColumns = [];
 	@foreach ($columns as $column)
 		sumColumns.push("{{ in_array($column, ['amount', 'paid', 'balance', 'cost', 'duration']) ? trans("texts.{$column}") : false }}");
@@ -278,17 +292,8 @@
         });
 
         $('#report_type').change(function() {
-            var val = $('#report_type').val();
-			if (val == '{{ ENTITY_TAX_RATE }}') {
-                $('#dateField').fadeIn();
-            } else {
-                $('#dateField').fadeOut();
-            }
-			if (val == '{{ ENTITY_INVOICE }}' || val == '{{ ENTITY_PRODUCT }}') {
-                $('#statusField').fadeIn();
-            } else {
-                $('#statusField').fadeOut();
-            }
+			var val = $('#report_type').val();
+			setFiltersShown();
             if (isStorageSupported()) {
                 localStorage.setItem('last:report_type', val);
             }
@@ -353,6 +358,7 @@
 			if (lastReportType) {
 				$('#report_type').val(lastReportType);
 			}
+			setFiltersShown();
 		});
     })