diff --git a/UI/context-bar-controls.cpp b/UI/context-bar-controls.cpp
index 1af2599ab..dc0d357f6 100644
--- a/UI/context-bar-controls.cpp
+++ b/UI/context-bar-controls.cpp
@@ -62,7 +62,7 @@ void SourceToolbar::SetUndoProperties(obs_source_t *source)
 
 		obs_source_t *scene_source =
 			obs_get_source_by_name(scene_name.c_str());
-		main->SetCurrentScene(scene_source);
+		main->SetCurrentScene(scene_source, true);
 		obs_source_release(scene_source);
 
 		obs_data_release(settings);
diff --git a/UI/source-tree.cpp b/UI/source-tree.cpp
index 802e74c2b..1a14855dd 100644
--- a/UI/source-tree.cpp
+++ b/UI/source-tree.cpp
@@ -413,7 +413,7 @@ void SourceTreeItem::ExitEditMode(bool save)
 
 		obs_source_t *scene_source =
 			obs_get_source_by_name(scene_name.c_str());
-		main->SetCurrentScene(scene_source);
+		main->SetCurrentScene(scene_source, true);
 		obs_source_release(scene_source);
 	};
 
@@ -424,7 +424,7 @@ void SourceTreeItem::ExitEditMode(bool save)
 
 		obs_source_t *scene_source =
 			obs_get_source_by_name(scene_name.c_str());
-		main->SetCurrentScene(scene_source);
+		main->SetCurrentScene(scene_source, true);
 		obs_source_release(scene_source);
 	};
 
diff --git a/UI/window-basic-filters.cpp b/UI/window-basic-filters.cpp
index a4a55d054..81774b000 100644
--- a/UI/window-basic-filters.cpp
+++ b/UI/window-basic-filters.cpp
@@ -575,7 +575,7 @@ void OBSBasicFilters::AddNewFilter(const char *id)
 			obs_source_t *ssource =
 				obs_get_source_by_name(scene_name.c_str());
 			reinterpret_cast<OBSBasic *>(App()->GetMainWindow())
-				->SetCurrentScene(ssource);
+				->SetCurrentScene(ssource, true);
 			obs_source_release(ssource);
 
 			obs_data_t *dat =
@@ -599,7 +599,7 @@ void OBSBasicFilters::AddNewFilter(const char *id)
 			obs_source_t *ssource =
 				obs_get_source_by_name(scene_name.c_str());
 			reinterpret_cast<OBSBasic *>(App()->GetMainWindow())
-				->SetCurrentScene(ssource);
+				->SetCurrentScene(ssource, true);
 			obs_source_release(ssource);
 
 			obs_data_t *dat =
@@ -829,7 +829,7 @@ void OBSBasicFilters::on_removeEffectFilter_clicked()
 					scene_name.c_str());
 				reinterpret_cast<OBSBasic *>(
 					App()->GetMainWindow())
-					->SetCurrentScene(ssource);
+					->SetCurrentScene(ssource, true);
 				obs_source_release(ssource);
 
 				obs_data_t *dat =
@@ -854,7 +854,7 @@ void OBSBasicFilters::on_removeEffectFilter_clicked()
 					scene_name.c_str());
 				reinterpret_cast<OBSBasic *>(
 					App()->GetMainWindow())
-					->SetCurrentScene(ssource);
+					->SetCurrentScene(ssource, true);
 				obs_source_release(ssource);
 
 				obs_data_t *dat =
@@ -1134,7 +1134,7 @@ void OBSBasicFilters::FilterNameEdited(QWidget *editor, QListWidget *list)
 			obs_source_t *ssource =
 				obs_get_source_by_name(scene_name.c_str());
 			reinterpret_cast<OBSBasic *>(App()->GetMainWindow())
-				->SetCurrentScene(ssource);
+				->SetCurrentScene(ssource, true);
 			obs_source_release(ssource);
 
 			obs_source_t *source =
@@ -1151,7 +1151,7 @@ void OBSBasicFilters::FilterNameEdited(QWidget *editor, QListWidget *list)
 			obs_source_t *ssource =
 				obs_get_source_by_name(scene_name.c_str());
 			reinterpret_cast<OBSBasic *>(App()->GetMainWindow())
-				->SetCurrentScene(ssource);
+				->SetCurrentScene(ssource, true);
 			obs_source_release(ssource);
 
 			obs_source_t *source =
diff --git a/UI/window-basic-main.cpp b/UI/window-basic-main.cpp
index ea26503d2..b71b6eac6 100644
--- a/UI/window-basic-main.cpp
+++ b/UI/window-basic-main.cpp
@@ -3739,7 +3739,7 @@ void OBSBasic::RemoveSelectedScene()
 
 		obs_source_t *scene_source = sources.back();
 		OBSScene scene = obs_scene_from_source(scene_source);
-		SetCurrentScene(scene);
+		SetCurrentScene(scene, true);
 
 		/* set original index in list box */
 		ui->scenes->blockSignals(true);
@@ -4927,7 +4927,7 @@ void OBSBasic::on_actionAddScene_triggered()
 		auto redo_fn = [this](const std::string &data) {
 			obs_scene_t *scene = obs_scene_create(data.c_str());
 			obs_source_t *source = obs_scene_get_source(scene);
-			SetCurrentScene(source);
+			SetCurrentScene(source, true);
 			obs_scene_release(scene);
 		};
 		undo_s.add_action(QTStr("Undo.Add").arg(QString(name.c_str())),
@@ -7155,7 +7155,7 @@ void undo_redo(const std::string &data)
 	obs_source_t *source =
 		obs_get_source_by_name(obs_data_get_string(dat, "scene_name"));
 	reinterpret_cast<OBSBasic *>(App()->GetMainWindow())
-		->SetCurrentScene(source);
+		->SetCurrentScene(source, true);
 	obs_source_release(source);
 	obs_data_release(dat);
 
diff --git a/UI/window-basic-preview.cpp b/UI/window-basic-preview.cpp
index ac03f3850..cbbdda388 100644
--- a/UI/window-basic-preview.cpp
+++ b/UI/window-basic-preview.cpp
@@ -730,7 +730,7 @@ void OBSBasicPreview::mouseReleaseEvent(QMouseEvent *event)
 		obs_source_t *source = obs_get_source_by_name(
 			obs_data_get_string(dat, "scene_name"));
 		reinterpret_cast<OBSBasic *>(App()->GetMainWindow())
-			->SetCurrentScene(source);
+			->SetCurrentScene(source, true);
 		obs_source_release(source);
 		obs_data_release(dat);
 
diff --git a/UI/window-basic-properties.cpp b/UI/window-basic-properties.cpp
index b6a161ebe..a616b4c00 100644
--- a/UI/window-basic-properties.cpp
+++ b/UI/window-basic-properties.cpp
@@ -375,7 +375,7 @@ void OBSBasicProperties::on_buttonBox_clicked(QAbstractButton *button)
 			obs_source_t *scene_source =
 				obs_get_source_by_name(scene_name.c_str());
 
-			OBSBasic::Get()->SetCurrentScene(source);
+			OBSBasic::Get()->SetCurrentScene(source, true);
 
 			obs_source_release(scene_source);
 
diff --git a/UI/window-basic-source-select.cpp b/UI/window-basic-source-select.cpp
index cee30e520..174bdb934 100644
--- a/UI/window-basic-source-select.cpp
+++ b/UI/window-basic-source-select.cpp
@@ -252,7 +252,7 @@ void OBSBasicSourceSelect::on_buttonBox_accepted()
 
 			obs_source_t *scene_source =
 				obs_get_source_by_name(scene_name.c_str());
-			main->SetCurrentScene(scene_source);
+			main->SetCurrentScene(scene_source, true);
 			obs_source_release(scene_source);
 
 			main->RefreshSources(main->GetCurrentScene());
@@ -282,7 +282,7 @@ void OBSBasicSourceSelect::on_buttonBox_accepted()
 
 			obs_source_t *scene_source =
 				obs_get_source_by_name(scene_name.c_str());
-			main->SetCurrentScene(scene_source);
+			main->SetCurrentScene(scene_source, true);
 			obs_source_release(scene_source);
 
 			main->RefreshSources(main->GetCurrentScene());
diff --git a/UI/window-basic-transform.cpp b/UI/window-basic-transform.cpp
index 4eb38cb18..b833033a4 100644
--- a/UI/window-basic-transform.cpp
+++ b/UI/window-basic-transform.cpp
@@ -92,7 +92,7 @@ OBSBasicTransform::~OBSBasicTransform()
 		obs_source_t *source = obs_get_source_by_name(
 			obs_data_get_string(dat, "scene_name"));
 		reinterpret_cast<OBSBasic *>(App()->GetMainWindow())
-			->SetCurrentScene(source);
+			->SetCurrentScene(source, true);
 		obs_source_release(source);
 		obs_data_release(dat);
 		obs_scene_load_transform_states(data.c_str());