diff --git a/Telegram/SourceFiles/settings/settings_codes.cpp b/Telegram/SourceFiles/settings/settings_codes.cpp
index 0a41ae714..f78247c1a 100644
--- a/Telegram/SourceFiles/settings/settings_codes.cpp
+++ b/Telegram/SourceFiles/settings/settings_codes.cpp
@@ -115,6 +115,22 @@ auto GenerateCodes() {
 			}
 		});
 	});
+	codes.emplace(qsl("testmode"), [](SessionController *window) {
+		auto &domain = Core::App().domain();
+		if (domain.started()
+			&& (domain.accounts().size() == 1)
+			&& !domain.active().sessionExists()) {
+			const auto environment = domain.active().mtp().environment();
+			domain.addActivated([&] {
+				return (environment == MTP::Environment::Production)
+					? MTP::Environment::Test
+					: MTP::Environment::Production;
+			}());
+			Ui::Toast::Show((environment == MTP::Environment::Production)
+				? "Switched to the test environment."
+				: "Switched to the production environment.");
+		}
+	});
 	codes.emplace(qsl("folders"), [](SessionController *window) {
 		if (window) {
 			window->showSettings(Settings::Type::Folders);
diff --git a/Telegram/SourceFiles/settings/settings_intro.cpp b/Telegram/SourceFiles/settings/settings_intro.cpp
index bc4e42f10..85a323fbf 100644
--- a/Telegram/SourceFiles/settings/settings_intro.cpp
+++ b/Telegram/SourceFiles/settings/settings_intro.cpp
@@ -350,7 +350,9 @@ void IntroWidget::resizeEvent(QResizeEvent *e) {
 }
 
 void IntroWidget::keyPressEvent(QKeyEvent *e) {
-	CodesFeedString(nullptr, e->text());
+	crl::on_main(this, [text = e->text()]{
+		CodesFeedString(nullptr, text);
+	});
 	return RpWidget::keyPressEvent(e);
 }