diff --git a/ui/scripts/ui/widgets/listView.js b/ui/scripts/ui/widgets/listView.js
index b01d01e18b0..60f701bcec9 100644
--- a/ui/scripts/ui/widgets/listView.js
+++ b/ui/scripts/ui/widgets/listView.js
@@ -1261,6 +1261,10 @@
       return true;
     });
 
+    $listView.find('#filterBy').bind('click',function(event) {
+     page = 1; //Handling the case to display more than 20 entities on a page while switching between panels
+     return page;
+    });
     var search = function() {
       loadBody(
         $table,