diff --git a/resources/views/datatable.blade.php b/resources/views/datatable.blade.php
index c090a69d4..69fe3c197 100644
--- a/resources/views/datatable.blade.php
+++ b/resources/views/datatable.blade.php
@@ -42,12 +42,12 @@
         });
     @endif
 
-    function refreshDatatable() {
-        window.dataTable.api().ajax.reload();
+    function refreshDatatable{{ isset($values['entityType']) ? '_' . $values['entityType'] : '' }}() {
+        window['dataTable{{ isset($values['entityType']) ? '_' . $values['entityType'] : '' }}'].api().ajax.reload();
     }
 
     function load_{{ $class }}() {
-        window.dataTable = jQuery('.{{ $class }}').dataTable({
+        window['dataTable{{ isset($values['entityType']) ? '_' . $values['entityType'] : '' }}'] = jQuery('.{{ $class }}').dataTable({
             "stateSave": true,
             "stateDuration": 0,
             "fnRowCallback": function(row, data) {
diff --git a/resources/views/list.blade.php b/resources/views/list.blade.php
index 562ef6ef1..9b79e907c 100644
--- a/resources/views/list.blade.php
+++ b/resources/views/list.blade.php
@@ -212,7 +212,7 @@
 			}
 			var url = '{{ URL::to('set_entity_filter/' . $entityType) }}' + '/' + filter;
 	        $.get(url, function(data) {
-	            refreshDatatable();
+	            refreshDatatable_{{ Utils::pluralizeEntityType($entityType) }}();
 	        })
 		}).maximizeSelect2Height();