diff --git a/iped-app/src/main/java/iped/app/ui/TreeListener.java b/iped-app/src/main/java/iped/app/ui/TreeListener.java
index 1843d3983f..3ee22d2fa8 100644
--- a/iped-app/src/main/java/iped/app/ui/TreeListener.java
+++ b/iped-app/src/main/java/iped/app/ui/TreeListener.java
@@ -238,6 +238,7 @@ public void clearFilter() {
 
         try {
             definedFilters = null;
+            selection.clear();
             App.get().tree.clearSelection();
         } finally {
             for (TreeSelectionListener lis : listeners) {
@@ -288,7 +289,8 @@ public List getDefinedFilters() {
 
     @Override
     public boolean hasFiltersApplied() {
-        return definedFilters != null && ((PathFilter) definedFilters.get(0)).evidenceParentIdMap.size() > 0;
+        return definedFilters != null && definedFilters.size() > 0
+                && ((PathFilter) definedFilters.get(0)).evidenceParentIdMap.size() > 0;
     }
 
     @Override
@@ -305,7 +307,8 @@ public String toString() {
 
     @Override
     public boolean hasFilters() {
-        return definedFilters != null && ((PathFilter) definedFilters.get(0)).evidenceParentIdMap.size() > 0;
+        return definedFilters != null && definedFilters.size() > 0
+                && ((PathFilter) definedFilters.get(0)).evidenceParentIdMap.size() > 0;
     }
 
     @Override