diff --git a/frontend/dialogs/OBSBasicFilters.cpp b/frontend/dialogs/OBSBasicFilters.cpp
index e54a4f5fc..e34e6b5c9 100644
--- a/frontend/dialogs/OBSBasicFilters.cpp
+++ b/frontend/dialogs/OBSBasicFilters.cpp
@@ -44,17 +44,17 @@ OBSBasicFilters::OBSBasicFilters(QWidget *parent, OBSSource source_)
 	: QDialog(parent),
 	  ui(new Ui::OBSBasicFilters),
 	  source(source_),
-	  addSignal(obs_source_get_signal_handler(source), "filter_add", OBSBasicFilters::OBSSourceFilterAdded, this),
-	  removeSignal(obs_source_get_signal_handler(source), "filter_remove", OBSBasicFilters::OBSSourceFilterRemoved,
-		       this),
-	  reorderSignal(obs_source_get_signal_handler(source), "reorder_filters", OBSBasicFilters::OBSSourceReordered,
-			this),
-	  removeSourceSignal(obs_source_get_signal_handler(source), "remove", OBSBasicFilters::SourceRemoved, this),
-	  renameSourceSignal(obs_source_get_signal_handler(source), "rename", OBSBasicFilters::SourceRenamed, this),
 	  noPreviewMargin(13)
 {
 	main = OBSBasic::Get();
 
+	signal_handler_t *handler = obs_source_get_signal_handler(source);
+	obsSignals.emplace_back(handler, "filter_add", OBSBasicFilters::OBSSourceFilterAdded, this);
+	obsSignals.emplace_back(handler, "filter_remove", OBSBasicFilters::OBSSourceFilterRemoved, this);
+	obsSignals.emplace_back(handler, "reorder_filters", OBSBasicFilters::OBSSourceReordered, this);
+	obsSignals.emplace_back(handler, "remove", OBSBasicFilters::SourceRemoved, this);
+	obsSignals.emplace_back(handler, "rename", OBSBasicFilters::SourceRenamed, this);
+
 	setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
 
 	ui->setupUi(this);
diff --git a/frontend/dialogs/OBSBasicFilters.hpp b/frontend/dialogs/OBSBasicFilters.hpp
index a02d51914..0ec62854c 100644
--- a/frontend/dialogs/OBSBasicFilters.hpp
+++ b/frontend/dialogs/OBSBasicFilters.hpp
@@ -34,12 +34,7 @@ private:
 	OBSSource source;
 	OBSPropertiesView *view = nullptr;
 
-	OBSSignal addSignal;
-	OBSSignal removeSignal;
-	OBSSignal reorderSignal;
-
-	OBSSignal removeSourceSignal;
-	OBSSignal renameSourceSignal;
+	std::vector<OBSSignal> obsSignals;
 	OBSSignal updatePropertiesSignal;
 
 	inline OBSSource GetFilter(int row, bool async);