diff --git a/changedetectionio/__init__.py b/changedetectionio/__init__.py
index 8de43f8f..65a8d8e1 100644
--- a/changedetectionio/__init__.py
+++ b/changedetectionio/__init__.py
@@ -713,6 +713,7 @@ def changedetection_app(config=None, datastore_o=None):
                                      available_processors=processors.available_processors(),
                                      browser_steps_config=browser_step_ui_config,
                                      emailprefix=os.getenv('NOTIFICATION_MAIL_BUTTON_PREFIX', False),
+                                     extra_title=f" - Edit - {watch.title}",
                                      form=form,
                                      has_default_notification_urls=True if len(datastore.data['settings']['application']['notification_urls']) else False,
                                      has_empty_checktime=using_default_check_time,
@@ -953,7 +954,7 @@ def changedetection_app(config=None, datastore_o=None):
                                  from_version=str(from_version),
                                  to_version=str(to_version),
                                  extra_stylesheets=extra_stylesheets,
-                                 extra_title=" - Diff - {}".format(watch['title'] if watch['title'] else watch['url']),
+                                 extra_title=f" - Diff - {watch.title}",
                                  extract_form=extract_form,
                                  is_html_webdriver=is_html_webdriver,
                                  last_error=watch['last_error'],