diff --git a/panels/base_panel.py b/panels/base_panel.py
index e103509e..9e42dc6a 100644
--- a/panels/base_panel.py
+++ b/panels/base_panel.py
@@ -348,6 +348,7 @@ class BasePanel(ScreenPanel):
         dialog.connect("delete-event", self.close_update_dialog)
         dialog.set_response_sensitive(Gtk.ResponseType.OK, False)
         dialog.get_widget_for_response(Gtk.ResponseType.OK).hide()
+        dialog.set_title(_("Updating"))
         self.update_dialog = dialog
         self._screen.updating = True
 
diff --git a/panels/job_status.py b/panels/job_status.py
index 5d79dec7..b02bc819 100644
--- a/panels/job_status.py
+++ b/panels/job_status.py
@@ -408,7 +408,8 @@ class JobStatusPanel(ScreenPanel):
             {"name": _("Apply"), "response": Gtk.ResponseType.APPLY},
             {"name": _("Cancel"), "response": Gtk.ResponseType.CANCEL}
         ]
-        self._gtk.Dialog(self._screen, buttons, grid, self.save_confirm, device)
+        dialog = self._gtk.Dialog(self._screen, buttons, grid, self.save_confirm, device)
+        dialog.set_title(_("Save Z"))
 
     def save_confirm(self, dialog, response_id, device):
         self._gtk.remove_dialog(dialog)
@@ -448,7 +449,8 @@ class JobStatusPanel(ScreenPanel):
         label.set_line_wrap(True)
         label.set_line_wrap_mode(Pango.WrapMode.WORD_CHAR)
 
-        self._gtk.Dialog(self._screen, buttons, label, self.cancel_confirm)
+        dialog = self._gtk.Dialog(self._screen, buttons, label, self.cancel_confirm)
+        dialog.set_title(_("Cancel"))
 
     def cancel_confirm(self, dialog, response_id):
         self._gtk.remove_dialog(dialog)
diff --git a/panels/network.py b/panels/network.py
index fa2e7c94..efc72eb5 100644
--- a/panels/network.py
+++ b/panels/network.py
@@ -286,7 +286,8 @@ class NetworkPanel(ScreenPanel):
         self.labels['connecting_info'].set_halign(Gtk.Align.START)
         self.labels['connecting_info'].set_valign(Gtk.Align.START)
         scroll.add(self.labels['connecting_info'])
-        self._gtk.Dialog(self._screen, buttons, scroll, self._gtk.remove_dialog)
+        dialog = self._gtk.Dialog(self._screen, buttons, scroll, self._gtk.remove_dialog)
+        dialog.set_title(_("Starting WiFi Association"))
         self._screen.show_all()
 
         if ssid in list(self.networks):
diff --git a/panels/print.py b/panels/print.py
index 6f2dd782..a77f5693 100644
--- a/panels/print.py
+++ b/panels/print.py
@@ -284,7 +284,8 @@ class PrintPanel(ScreenPanel):
             image.set_vexpand(False)
             grid.attach_next_to(image, label, Gtk.PositionType.BOTTOM, 1, 1)
 
-        self._gtk.Dialog(self._screen, buttons, grid, self.confirm_print_response, filename)
+        dialog = self._gtk.Dialog(self._screen, buttons, grid, self.confirm_print_response, filename)
+        dialog.set_title(_("Print"))
 
     def confirm_print_response(self, dialog, response_id, filename):
         self._gtk.remove_dialog(dialog)
diff --git a/panels/system.py b/panels/system.py
index 31acc2b5..6002f357 100644
--- a/panels/system.py
+++ b/panels/system.py
@@ -148,7 +148,8 @@ class SystemPanel(ScreenPanel):
                     {"name": _("Recover Soft"), "response": Gtk.ResponseType.APPLY},
                     {"name": _("Cancel"), "response": Gtk.ResponseType.CANCEL}
                 ]
-                self._gtk.Dialog(self._screen, recoverybuttons, scroll, self.reset_confirm, program)
+                dialog = self._gtk.Dialog(self._screen, recoverybuttons, scroll, self.reset_confirm, program)
+                dialog.set_title(_("Recover"))
                 return
             else:
                 if info['version'] == info['remote_version']:
@@ -212,7 +213,8 @@ class SystemPanel(ScreenPanel):
             {"name": _("Update"), "response": Gtk.ResponseType.OK},
             {"name": _("Cancel"), "response": Gtk.ResponseType.CANCEL}
         ]
-        self._gtk.Dialog(self._screen, buttons, scroll, self.update_confirm, program)
+        dialog = self._gtk.Dialog(self._screen, buttons, scroll, self.update_confirm, program)
+        dialog.set_title(_("Update"))
 
     def update_confirm(self, dialog, response_id, program):
         self._gtk.remove_dialog(dialog)
@@ -326,7 +328,11 @@ class SystemPanel(ScreenPanel):
             {"name": _("Printer"), "response": Gtk.ResponseType.APPLY},
             {"name": _("Cancel"), "response": Gtk.ResponseType.CANCEL}
         ]
-        self._gtk.Dialog(self._screen, buttons, scroll, self.reboot_poweroff_confirm, method)
+        dialog = self._gtk.Dialog(self._screen, buttons, scroll, self.reboot_poweroff_confirm, method)
+        if method == "reboot":
+            dialog.set_title(_("Restart"))
+        else:
+            dialog.set_title(_("Shutdown"))
 
     def reboot_poweroff_confirm(self, dialog, response_id, method):
         self._gtk.remove_dialog(dialog)
diff --git a/screen.py b/screen.py
index 4fde8486..7f33037d 100755
--- a/screen.py
+++ b/screen.py
@@ -375,7 +375,8 @@ class KlipperScreen(Gtk.Window):
         buttons = [
             {"name": _("Go Back"), "response": Gtk.ResponseType.CANCEL}
         ]
-        self.gtk.Dialog(self, buttons, grid, self.error_modal_response)
+        dialog = self.gtk.Dialog(self, buttons, grid, self.error_modal_response)
+        dialog.set_title(_("Error"))
 
     def error_modal_response(self, dialog, response_id):
         self.gtk.remove_dialog(dialog)
@@ -756,6 +757,7 @@ class KlipperScreen(Gtk.Window):
         if self.confirm is not None:
             self.gtk.remove_dialog(self.confirm)
         self.confirm = self.gtk.Dialog(self, buttons, label, self._confirm_send_action_response, method, params)
+        self.confirm.set_title("KlipperScreen")
 
     def _confirm_send_action_response(self, dialog, response_id, method, params):
         self.gtk.remove_dialog(dialog)