diff --git a/obs/window-basic-settings.cpp b/obs/window-basic-settings.cpp
index 8bbba9d89..957bd5bf7 100644
--- a/obs/window-basic-settings.cpp
+++ b/obs/window-basic-settings.cpp
@@ -2296,8 +2296,13 @@ void OBSBasicSettings::on_buttonBox_clicked(QAbstractButton *button)
 
 	if (val == QDialogButtonBox::AcceptRole ||
 	    val == QDialogButtonBox::RejectRole) {
-		if (val == QDialogButtonBox::RejectRole)
+		if (val == QDialogButtonBox::RejectRole) {
 			App()->SetTheme(savedTheme);
+#ifdef _WIN32
+			if (toggleAero)
+				SetAeroEnabled(!aeroWasDisabled);
+#endif
+		}
 		ClearChanged();
 		close();
 	}