diff --git a/lib/queue/action-queue.cpp b/lib/queue/action-queue.cpp
index a0cce29a..1132b243 100644
--- a/lib/queue/action-queue.cpp
+++ b/lib/queue/action-queue.cpp
@@ -180,7 +180,7 @@ ActionQueueSettingsDialog::ActionQueueSettingsDialog(QWidget *parent,
 			     "AdvSceneSwitcher.actionQueues.select",
 			     "AdvSceneSwitcher.actionQueues.add",
 			     "AdvSceneSwitcher.actionQueues.nameNotAvailable",
-			     parent),
+			     true, parent),
 	  _queueRunStatus(new QLabel()),
 	  _startStopToggle(new QPushButton()),
 	  _queueSize(new QLabel()),
diff --git a/lib/utils/item-selection-helpers.cpp b/lib/utils/item-selection-helpers.cpp
index 74315d77..9cdda8fd 100644
--- a/lib/utils/item-selection-helpers.cpp
+++ b/lib/utils/item-selection-helpers.cpp
@@ -265,6 +265,7 @@ ItemSettingsDialog::ItemSettingsDialog(const Item &settings,
 				       std::string_view select,
 				       std::string_view add,
 				       std::string_view nameConflict,
+				       bool showNameEmptyWarning,
 				       QWidget *parent)
 	: QDialog(parent),
 	  _name(new QLineEdit()),
@@ -274,7 +275,8 @@ ItemSettingsDialog::ItemSettingsDialog(const Item &settings,
 	  _items(items),
 	  _selectStr(select),
 	  _addStr(add),
-	  _conflictStr(nameConflict)
+	  _conflictStr(nameConflict),
+	  _showNameEmptyWarning(showNameEmptyWarning)
 {
 	setModal(true);
 	setWindowModality(Qt::WindowModality::WindowModal);
diff --git a/lib/utils/item-selection-helpers.hpp b/lib/utils/item-selection-helpers.hpp
index b3517bec..a14f37c5 100644
--- a/lib/utils/item-selection-helpers.hpp
+++ b/lib/utils/item-selection-helpers.hpp
@@ -45,7 +45,7 @@ public:
 		std::string_view addString = "AdvSceneSwitcher.item.add",
 		std::string_view conflictString =
 			"AdvSceneSwitcher.item.nameNotAvailable",
-		QWidget *parent = 0);
+		bool showEmptyNameWarning = true, QWidget *parent = 0);
 	virtual ~ItemSettingsDialog() = default;
 
 private slots:
diff --git a/lib/variables/variable.cpp b/lib/variables/variable.cpp
index 7fc565e1..d98fe096 100644
--- a/lib/variables/variable.cpp
+++ b/lib/variables/variable.cpp
@@ -137,7 +137,8 @@ VariableSettingsDialog::VariableSettingsDialog(QWidget *parent,
 	: ItemSettingsDialog(settings, variables,
 			     "AdvSceneSwitcher.variable.select",
 			     "AdvSceneSwitcher.variable.add",
-			     "AdvSceneSwitcher.item.nameNotAvailable", parent),
+			     "AdvSceneSwitcher.item.nameNotAvailable", true,
+			     parent),
 	  _value(new ResizingPlainTextEdit(this)),
 	  _defaultValue(new ResizingPlainTextEdit(this)),
 	  _save(new QComboBox())
diff --git a/plugins/base/utils/connection-manager.cpp b/plugins/base/utils/connection-manager.cpp
index 064a5afd..5766fec3 100644
--- a/plugins/base/utils/connection-manager.cpp
+++ b/plugins/base/utils/connection-manager.cpp
@@ -332,7 +332,8 @@ WSConnectionSettingsDialog::WSConnectionSettingsDialog(
 	: ItemSettingsDialog(settings, connections,
 			     "AdvSceneSwitcher.connection.select",
 			     "AdvSceneSwitcher.connection.add",
-			     "AdvSceneSwitcher.item.nameNotAvailable", parent),
+			     "AdvSceneSwitcher.item.nameNotAvailable", true,
+			     parent),
 	  _useCustomURI(new QCheckBox()),
 	  _customUri(new QLineEdit()),
 	  _address(new QLineEdit()),
diff --git a/plugins/twitch/token.cpp b/plugins/twitch/token.cpp
index b127c63e..172e4b0a 100644
--- a/plugins/twitch/token.cpp
+++ b/plugins/twitch/token.cpp
@@ -439,7 +439,7 @@ TwitchTokenSettingsDialog::TwitchTokenSettingsDialog(
 			     "AdvSceneSwitcher.twitchToken.select",
 			     "AdvSceneSwitcher.twitchToken.add",
 			     "AdvSceneSwitcher.twitchToken.nameNotAvailable",
-			     parent),
+			     false, parent),
 	  _requestToken(new QPushButton(
 		  obs_module_text("AdvSceneSwitcher.twitchToken.request"))),
 	  _showToken(new QPushButton()),
@@ -456,7 +456,6 @@ TwitchTokenSettingsDialog::TwitchTokenSettingsDialog(
 	_currentTokenValue->setText(QString::fromStdString(settings._token));
 
 	_name->setReadOnly(true);
-	_showNameEmptyWarning = false;
 
 	QWidget::connect(_requestToken, SIGNAL(clicked()), this,
 			 SLOT(RequestToken()));