diff --git a/frontend/app/scripts/controllers/alert/AlertListCtrl.js b/frontend/app/scripts/controllers/alert/AlertListCtrl.js
index 8c7d322cf2..13f80ce024 100755
--- a/frontend/app/scripts/controllers/alert/AlertListCtrl.js
+++ b/frontend/app/scripts/controllers/alert/AlertListCtrl.js
@@ -83,6 +83,10 @@
                 this.filtering.toggleFilters();
             };
 
+            this.toggleAdvanced = function () {
+                this.filtering.toggleAdvanced();
+            };
+
             this.canMarkAsRead = AlertingSrv.canMarkAsRead;
             this.canMarkAsUnread = AlertingSrv.canMarkAsUnread;
 
diff --git a/frontend/app/scripts/controllers/case/CaseListCtrl.js b/frontend/app/scripts/controllers/case/CaseListCtrl.js
index 93e0e1a5bd..5d6f22f2ee 100644
--- a/frontend/app/scripts/controllers/case/CaseListCtrl.js
+++ b/frontend/app/scripts/controllers/case/CaseListCtrl.js
@@ -168,6 +168,10 @@
             this.filtering.toggleFilters();
         };
 
+        this.toggleAdvanced = function () {
+            this.filtering.toggleAdvanced();
+        };
+
         this.filter = function () {
             self.filtering.filter().then(this.applyFilters);
         };
diff --git a/frontend/app/scripts/services/common/ui/FilteringSrv.js b/frontend/app/scripts/services/common/ui/FilteringSrv.js
index fcc4ce0ec9..921c8edf8e 100644
--- a/frontend/app/scripts/services/common/ui/FilteringSrv.js
+++ b/frontend/app/scripts/services/common/ui/FilteringSrv.js
@@ -36,6 +36,7 @@
                                     state: state,
                                     showFilters: self.defaults.showFilters || false,
                                     showStats: self.defaults.showStats || false,
+                                    showAdvanced: self.defaults.showAdvanced || true,
                                     pageSize: self.defaults.pageSize || 15,
                                     sort: self.defaults.sort || [],
                                     filters: self.defaultFilter || []
@@ -106,6 +107,11 @@
                     self.storeContext();
                 };
 
+                this.toggleAdvanced = function() {
+                    self.context.showAdvanced = !self.context.showAdvanced;
+                    self.storeContext();
+                };
+
                 this.setPageSize = function(pageSize) {
                     self.context.pageSize = pageSize;
                     self.storeContext();
diff --git a/frontend/app/views/partials/alert/list.html b/frontend/app/views/partials/alert/list.html
index 224dadefcd..6fbbf1fe8d 100644
--- a/frontend/app/views/partials/alert/list.html
+++ b/frontend/app/views/partials/alert/list.html
@@ -175,7 +175,7 @@ <h3 class="box-title">List of alerts ({{$vm.list.total || 0}} of {{$vm.alertList
                                     </td>
                                     <td></td>
                                 </tr>
-                                <tr>
+                                <tr ng-if="$vm.filtering.context.showAdvanced">
                                     <td></td>
                                     <td colspan="9">
                                         <custom-field-labels custom-fields="event.customFields" on-field-click="$vm.addFilterValue(name, value)"><custom-field-labels>
diff --git a/frontend/app/views/partials/alert/list/toolbar.html b/frontend/app/views/partials/alert/list/toolbar.html
index 52342a720e..bc49d48021 100644
--- a/frontend/app/views/partials/alert/list/toolbar.html
+++ b/frontend/app/views/partials/alert/list/toolbar.html
@@ -102,6 +102,12 @@
                     <i class="fa fa-bar-chart"></i> Stats
                 </button>
             </div>
+
+            <div class="btn-group pull-right" role="group">
+                <button class="btn btn-sm" ng-class="{true: 'btn-primary', false:'btn-default'}[!!$vm.filtering.context.showAdvanced]" type="button" ng-click="$vm.toggleAdvanced()">
+                    <i class="fa fa-code"></i> Custom Fields
+                </button>
+            </div>
         </div>
     </div>
 </div>
diff --git a/frontend/app/views/partials/case/case.list.html b/frontend/app/views/partials/case/case.list.html
index c9c29928b2..e86b33b0fc 100644
--- a/frontend/app/views/partials/case/case.list.html
+++ b/frontend/app/views/partials/case/case.list.html
@@ -76,7 +76,7 @@ <h3 class="box-title">List of cases ({{$vm.list.total || 0}} of {{$vm.caseCount}
                                             </span>
                                         </div>
 
-                                        <custom-field-labels custom-fields="currentCase.customFields" on-field-click="$vm.addFilterValue(name, value)"><custom-field-labels>
+                                        <custom-field-labels ng-if="$vm.filtering.context.showAdvanced" custom-fields="currentCase.customFields" on-field-click="$vm.addFilterValue(name, value)"><custom-field-labels>
 
                                         <div class="text-success" ng-show="currentCase.status !== 'Open'">
                                             <small>
diff --git a/frontend/app/views/partials/case/list/toolbar.html b/frontend/app/views/partials/case/list/toolbar.html
index dbcffd29b2..8c6363308e 100644
--- a/frontend/app/views/partials/case/list/toolbar.html
+++ b/frontend/app/views/partials/case/list/toolbar.html
@@ -76,10 +76,16 @@
             </div>
 
             <div class="btn-group pull-right" role="group">
-                <button class="btn btn-sm" ng-class="{true: 'btn-primary', false:'btn-default'}[$vm.filtering.context.showStats]" type="button" ng-click="$vm.toggleStats()">
+                <button class="btn btn-sm" ng-class="{true: 'btn-primary', false:'btn-default'}[!!$vm.filtering.context.showStats]" type="button" ng-click="$vm.toggleStats()">
                     <i class="fa fa-bar-chart"></i> Stats
                 </button>
             </div>
+
+            <div class="btn-group pull-right" role="group">
+                <button class="btn btn-sm" ng-class="{true: 'btn-primary', false:'btn-default'}[!!$vm.filtering.context.showAdvanced]" type="button" ng-click="$vm.toggleAdvanced()">
+                    <i class="fa fa-code"></i> Custom Fields
+                </button>
+            </div>
         </div>
     </div>
 </div>