diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp
index dba081de9..de502a4f9 100644
--- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp
@@ -161,16 +161,10 @@ void VisualDatabaseDisplayColorFilterWidget::addCustomFilterModeItem()
 
 void VisualDatabaseDisplayColorFilterWidget::handleColorToggled(QChar color, bool active)
 {
-    if (currentMode == FilterMode::Custom) {
-        for (ManaSymbolWidget *manaSymbolWidget : findChildren<ManaSymbolWidget *>()) {
-            manaSymbolWidget->setColorActive(false);
-        }
+    if (active) {
+        addFilter(color);
     } else {
-        if (active) {
-            addFilter(color);
-        } else {
-            removeFilter(color);
-        }
+        removeFilter(color);
     }
 }
 
@@ -341,5 +335,6 @@ void VisualDatabaseDisplayColorFilterWidget::syncWithFilterModel()
         }
 
         manaSymbolWidget->setColorActive(useExclude ? !found : found);
+        manaSymbolWidget->setDisabled(currentMode == FilterMode::Custom);
     }
 }