diff --git a/UI/window-basic-auto-config.cpp b/UI/window-basic-auto-config.cpp
index d8ddbfa44..51947e477 100644
--- a/UI/window-basic-auto-config.cpp
+++ b/UI/window-basic-auto-config.cpp
@@ -302,8 +302,11 @@ AutoConfigStreamPage::AutoConfigStreamPage(QWidget *parent)
 	connect(ui->service, &QComboBox::currentIndexChanged, this,
 		&AutoConfigStreamPage::UpdateMoreInfoLink);
 
-	connect(ui->useStreamKeyAdv, &QPushButton::clicked,
-		[&]() { ui->streamKeyWidget->setVisible(true); });
+	connect(ui->useStreamKeyAdv, &QPushButton::clicked, [&]() {
+		ui->streamKeyWidget->setVisible(true);
+		ui->streamKeyLabel->setVisible(true);
+		ui->useStreamKeyAdv->setVisible(false);
+	});
 
 	connect(ui->key, &QLineEdit::textChanged, this,
 		&AutoConfigStreamPage::UpdateCompleted);
diff --git a/UI/window-basic-settings-stream.cpp b/UI/window-basic-settings-stream.cpp
index 2ad275a44..27c44990c 100644
--- a/UI/window-basic-settings-stream.cpp
+++ b/UI/window-basic-settings-stream.cpp
@@ -480,6 +480,8 @@ static void get_yt_ch_title(Ui::OBSBasicSettings *ui)
 void OBSBasicSettings::UseStreamKeyAdvClicked()
 {
 	ui->streamKeyWidget->setVisible(true);
+	ui->streamKeyLabel->setVisible(true);
+	ui->useStreamKeyAdv->setVisible(false);
 }
 
 void OBSBasicSettings::on_service_currentIndexChanged(int idx)