diff --git a/client/brewpi_gui.py b/client/brewpi_gui.py
index e8c0920..3f3e1d9 100755
--- a/client/brewpi_gui.py
+++ b/client/brewpi_gui.py
@@ -391,6 +391,15 @@ class Window(QtWidgets.QMainWindow, Ui_MainWindow):
 		ambient = "{:.1f}°C".format(self.ambient_temp) if self.ambient_temp is not None else "-"
 		self.status_label_env.setText("Ambient: {}   Warp: {:.1f}x".format(ambient, self.warp_factor))
 
+	@staticmethod
+	def _make_window_title(name, description):
+		title = "BrewPi"
+		if name:
+			title += " - {}".format(name)
+		if description:
+			title += " - {}".format(description)
+		return title
+
 	def set_sud_cooling(self, cooling):
 		if cooling == self.sud_cooling:
 			return
@@ -589,7 +598,7 @@ class Window(QtWidgets.QMainWindow, Ui_MainWindow):
 					self.update_sud_forecast(msg['Json'])
 			elif "Name" in key:
 				self.statusBar().showMessage("Sud schedule updated: {}".format(msg['Name']), 5000)
-				self.setWindowTitle("BrewPi - {}".format(msg['Name']) if msg['Name'] else "BrewPi")
+				self.setWindowTitle(self._make_window_title(msg.get('Name', ''), msg.get('Description', '')))
 			elif "State" in key:
 				prev_state = self.sud_state
 				self.sud_state = msg['State']