1 files changed, 7 insertions, 0 deletions
diff --git a/src/modinfodialog.cpp b/src/modinfodialog.cpp
index 1e933a74..0f18033a 100644
--- a/src/modinfodialog.cpp
+++ b/src/modinfodialog.cpp
@@ -454,6 +454,7 @@ ModInfoDialog::ModInfoDialog(ModInfo::Ptr modInfo, const DirectoryEntry *directo
 
 
   m_advancedConflictFilter.set(ui->conflictsAdvancedFilter);
+  m_advancedConflictFilter.changed = [&]{ refreshConflictLists(false, true); };
 
   // left-elide the overwrites column so that the nearest are visible
   ui->conflictsAdvancedList->setItemDelegateForColumn(
@@ -873,6 +874,12 @@ QTreeWidgetItem* ModInfoDialog::createAdvancedConflictItem(
     }
   }
 
+  if (!m_advancedConflictFilter.matches(before) &&
+      !m_advancedConflictFilter.matches(relativeName) &&
+      !m_advancedConflictFilter.matches(after)) {
+      return nullptr;
+  }
+
   QTreeWidgetItem* item = new QTreeWidgetItem;
   item->setText(0, before);
   item->setText(1, relativeName);