diff --git a/UI/window-basic-main.cpp b/UI/window-basic-main.cpp
index dc9b48094..386c75bdf 100644
--- a/UI/window-basic-main.cpp
+++ b/UI/window-basic-main.cpp
@@ -4768,8 +4768,6 @@ void OBSBasic::on_action_Settings_triggered()
 		settings.exec();
 	}
 
-	SystemTray(false);
-
 	settings_already_executing = false;
 
 	if (restart) {
diff --git a/UI/window-basic-settings.cpp b/UI/window-basic-settings.cpp
index 2a34e6283..c6991fe0d 100644
--- a/UI/window-basic-settings.cpp
+++ b/UI/window-basic-settings.cpp
@@ -3151,11 +3151,14 @@ void OBSBasicSettings::SaveGeneralSettings()
 				"KeepReplayBufferStreamStops",
 				ui->keepReplayStreamStops->isChecked());
 
-	if (WidgetChanged(ui->systemTrayEnabled))
+	if (WidgetChanged(ui->systemTrayEnabled)) {
 		config_set_bool(GetGlobalConfig(), "BasicWindow",
 				"SysTrayEnabled",
 				ui->systemTrayEnabled->isChecked());
 
+		main->SystemTray(false);
+	}
+
 	if (WidgetChanged(ui->systemTrayWhenStarted))
 		config_set_bool(GetGlobalConfig(), "BasicWindow",
 				"SysTrayWhenStarted",