diff --git a/cockatrice/src/filtertree.cpp b/cockatrice/src/filtertree.cpp
index e1dc31012..4c28028b1 100644
--- a/cockatrice/src/filtertree.cpp
+++ b/cockatrice/src/filtertree.cpp
@@ -112,9 +112,12 @@ bool FilterItemList::testTypeAnd(const CardInfo *info, CardFilter::Attr attr) co
 {
     QList<FilterItem *>::const_iterator i;
 
-    for (i = childNodes.constBegin(); i != childNodes.constEnd(); i++)
+    for (i = childNodes.constBegin(); i != childNodes.constEnd(); i++) {
+        if (!(*i)->isEnabled())
+            continue;
         if (!(*i)->acceptCardAttr(info, attr))
             return false;
+    }
 
     return true;
 }
@@ -129,9 +132,12 @@ bool FilterItemList::testTypeOr(const CardInfo *info, CardFilter::Attr attr) con
 {
     QList<FilterItem *>::const_iterator i;
 
-    for (i = childNodes.constBegin(); i != childNodes.constEnd(); i++)
+    for (i = childNodes.constBegin(); i != childNodes.constEnd(); i++) {
+        if (!(*i)->isEnabled())
+            continue;
         if ((*i)->acceptCardAttr(info, attr))
             return true;
+    }
 
     return false;
 }
@@ -197,9 +203,6 @@ bool FilterItem::acceptCardAttr(const CardInfo *info, CardFilter::Attr attr) con
 {
     bool status;
 
-    if (!isEnabled())
-        return true;
-
     switch (attr) {
         case CardFilter::AttrName:
             status = acceptName(info);