diff --git a/public/js/app.js b/public/js/app.js
index 98c641a..8c881c7 100644
--- a/public/js/app.js
+++ b/public/js/app.js
@@ -760,12 +760,12 @@
       setRouteControlOpen($('#route-control-dropdown').prop('hidden'));
     });
 
-    activate('#route-control-new', function () {
+    activate('.route-control-actions #route-control-new', function () {
       setRouteControlOpen(false);
       ns.EditorUi?.openNewLocalRoute?.();
     });
 
-    activate('#editor-button', function () {
+    activate('.route-control-actions #editor-button', function () {
       setRouteControlOpen(false);
     });
 
diff --git a/public/js/editor-ui.js b/public/js/editor-ui.js
index 7106bd5..1e3c357 100644
--- a/public/js/editor-ui.js
+++ b/public/js/editor-ui.js
@@ -8,6 +8,7 @@ globalThis.Wegwichtel = globalThis.Wegwichtel || {};
     button: 'editor-button',
     close: 'editor-close',
     dialog: 'editor-dialog',
+    dialogTitle: 'editor-dialog-title',
     newRoute: 'editor-new-route',
     poiAudio: 'editor-poi-audio',
     poiCancel: 'editor-poi-cancel',
@@ -124,19 +125,34 @@ globalThis.Wegwichtel = globalThis.Wegwichtel || {};
     status.dataset.kind = isError ? 'error' : 'notice';
   }
 
+  function setDialogTitle(value) {
+    const title = byId(ids.dialogTitle);
+    if (title) title.textContent = value;
+  }
+
+  function routeDialogTitle() {
+    if (state.currentSource === 'local') {
+      return routeId(state.currentRoute) ? 'Lokale Strecke bearbeiten' : 'Neue lokale Strecke';
+    }
+    return 'Veröffentlichte Strecke bearbeiten';
+  }
+
   function showListView() {
+    setDialogTitle('Streckenverwaltung');
     setHidden(byId(ids.routeListView), false);
     setHidden(byId(ids.routeDetailView), true);
     setHidden(byId(ids.poiFormView), true);
   }
 
   function showRouteView() {
+    setDialogTitle(routeDialogTitle());
     setHidden(byId(ids.routeListView), true);
     setHidden(byId(ids.routeDetailView), false);
     setHidden(byId(ids.poiFormView), true);
   }
 
   function showPoiView() {
+    setDialogTitle(state.currentPoi ? 'POI bearbeiten' : 'POI hinzufügen');
     setHidden(byId(ids.routeListView), true);
     setHidden(byId(ids.routeDetailView), true);
     setHidden(byId(ids.poiFormView), false);