diff --git a/web/src/lib/components/confirm_modal.svelte b/web/src/lib/components/confirm_modal.svelte
index 37feef1f..72e83f96 100644
--- a/web/src/lib/components/confirm_modal.svelte
+++ b/web/src/lib/components/confirm_modal.svelte
@@ -6,16 +6,20 @@
         title?: string;
         text: string;
         action?: string;
+        deny?: string;
         id?: string;
         onconfirm?: () => void
+        oncancel?: () => void
     }
 
     let {
         title = $_("confirm-deletion"),
         text,
         action = "delete",
+        deny ="cancel",
         id = "confirm-modal",
-        onconfirm
+        onconfirm,
+        oncancel
     }: Props = $props();
 
     let modal: Modal;
@@ -24,6 +28,11 @@
         modal.openModal();
     }
 
+    function cancel() {
+        oncancel?.();
+        modal.closeModal!();
+    }
+    
     function confirm() {
         onconfirm?.()
         modal.closeModal!();
@@ -36,8 +45,8 @@
     {/snippet}
     {#snippet footer()}
         <div class="flex items-center gap-4">
-            <button class="btn-secondary" onclick={() => modal.closeModal()}
-                >{$_("cancel")}</button
+            <button class="btn-secondary" onclick={cancel}
+                >{$_(deny)}</button
             >
             <button
                 id="confirm"
diff --git a/web/src/lib/i18n/locales/de.json b/web/src/lib/i18n/locales/de.json
index 40b30900..3c116469 100644
--- a/web/src/lib/i18n/locales/de.json
+++ b/web/src/lib/i18n/locales/de.json
@@ -215,6 +215,7 @@
   "invalid-username": "Ungültiger Nutzername",
   "italian": "Italienisch",
   "joined": "Beigetreten",
+  "keep-private": "Ohne Veröffentlichung fortfahren",
   "keep-original": "",
   "language": "Sprache",
   "latitude": "Breitengrad",
diff --git a/web/src/lib/i18n/locales/en.json b/web/src/lib/i18n/locales/en.json
index 54323e2a..6e9bcca3 100644
--- a/web/src/lib/i18n/locales/en.json
+++ b/web/src/lib/i18n/locales/en.json
@@ -215,6 +215,7 @@
   "invalid-username": "Invalid username",
   "italian": "Italian",
   "joined": "Joined",
+  "keep-private": "Keep private",
   "keep-original": "Keep original",
   "language": "Language",
   "latitude": "Latitude",
diff --git a/web/src/lib/i18n/locales/es.json b/web/src/lib/i18n/locales/es.json
index dc600989..03d2be96 100644
--- a/web/src/lib/i18n/locales/es.json
+++ b/web/src/lib/i18n/locales/es.json
@@ -213,6 +213,7 @@
   "invalid-date": "Fecha no válida",
   "invalid-username": "Usuario no válido",
   "italian": "Italiano",
+  "keep-private": "Keep private",
   "joined": "Afiliado",
   "keep-original": "",
   "language": "Idioma",
diff --git a/web/src/lib/i18n/locales/eu.json b/web/src/lib/i18n/locales/eu.json
index 4fc8b43b..9ea42dd3 100644
--- a/web/src/lib/i18n/locales/eu.json
+++ b/web/src/lib/i18n/locales/eu.json
@@ -215,6 +215,7 @@
   "invalid-username": "Erabiltzailea ez da zuzena",
   "italian": "Italiera",
   "joined": "Sartu da",
+  "keep-private": "Keep private",
   "keep-original": "",
   "language": "Hizkuntza",
   "latitude": "Latitudea",
diff --git a/web/src/lib/i18n/locales/fr.json b/web/src/lib/i18n/locales/fr.json
index ab5f2147..ae1d11b3 100644
--- a/web/src/lib/i18n/locales/fr.json
+++ b/web/src/lib/i18n/locales/fr.json
@@ -215,6 +215,7 @@
   "invalid-username": "Nom d'utilisateur invalide",
   "italian": "Italien",
   "joined": "Rejoint",
+  "keep-private": "Keep private",
   "keep-original": "",
   "language": "Langue",
   "latitude": "Latitude",
diff --git a/web/src/lib/i18n/locales/hu.json b/web/src/lib/i18n/locales/hu.json
index 01aedc61..653bd1ae 100644
--- a/web/src/lib/i18n/locales/hu.json
+++ b/web/src/lib/i18n/locales/hu.json
@@ -215,6 +215,7 @@
   "invalid-username": "Érvénytelen felhasználó",
   "italian": "Olasz",
   "joined": "Joined",
+  "keep-private": "Keep private",
   "keep-original": "",
   "language": "Nyelf",
   "latitude": "Szélesség",
diff --git a/web/src/lib/i18n/locales/it.json b/web/src/lib/i18n/locales/it.json
index ecf3f03b..55ea9d2f 100644
--- a/web/src/lib/i18n/locales/it.json
+++ b/web/src/lib/i18n/locales/it.json
@@ -215,6 +215,7 @@
   "invalid-username": "Nome utente non valido",
   "italian": "Italiano",
   "joined": "Aggiunto",
+  "keep-private": "Keep private",
   "keep-original": "",
   "language": "Lingua",
   "latitude": "Latitudine",
diff --git a/web/src/lib/i18n/locales/nl.json b/web/src/lib/i18n/locales/nl.json
index 7e266d19..a3b6a024 100644
--- a/web/src/lib/i18n/locales/nl.json
+++ b/web/src/lib/i18n/locales/nl.json
@@ -216,6 +216,7 @@
   "invalid-username": "Ongeldige gebruikersnaam",
   "italian": "Italiaans",
   "joined": "Aangesloten",
+  "keep-private": "Keep private",
   "keep-original": "",
   "language": "Taal",
   "latitude": "Breedtegraad",
diff --git a/web/src/lib/i18n/locales/pl.json b/web/src/lib/i18n/locales/pl.json
index 73ef29af..10fdff14 100644
--- a/web/src/lib/i18n/locales/pl.json
+++ b/web/src/lib/i18n/locales/pl.json
@@ -215,6 +215,7 @@
   "invalid-username": "Błędna nazwa użytkownika",
   "italian": "Włoski",
   "joined": "Dołączono",
+  "keep-private": "Keep private",
   "keep-original": "",
   "language": "Język",
   "latitude": "Szerokość",
diff --git a/web/src/lib/i18n/locales/pt.json b/web/src/lib/i18n/locales/pt.json
index 6ef43132..1ce09643 100644
--- a/web/src/lib/i18n/locales/pt.json
+++ b/web/src/lib/i18n/locales/pt.json
@@ -215,6 +215,7 @@
   "invalid-username": "Nome de usuário inválido",
   "italian": "Italiano",
   "joined": "Joined",
+  "keep-private": "Keep private",
   "keep-original": "",
   "language": "Língua",
   "latitude": "Latitude",
diff --git a/web/src/lib/i18n/locales/ru.json b/web/src/lib/i18n/locales/ru.json
index af2a6b1e..e28bd4c2 100644
--- a/web/src/lib/i18n/locales/ru.json
+++ b/web/src/lib/i18n/locales/ru.json
@@ -215,6 +215,7 @@
   "invalid-username": "Некорректное имя пользователя",
   "italian": "Итальянский",
   "joined": "Зарегистрирован",
+  "keep-private": "Keep private",
   "keep-original": "",
   "language": "Язык",
   "latitude": "Широта",
diff --git a/web/src/lib/i18n/locales/zh.json b/web/src/lib/i18n/locales/zh.json
index 8a655730..6a4801d5 100644
--- a/web/src/lib/i18n/locales/zh.json
+++ b/web/src/lib/i18n/locales/zh.json
@@ -215,6 +215,7 @@
   "invalid-username": "无效用户名",
   "italian": "意大利语",
   "joined": "已加入",
+  "keep-private": "Keep private",
   "keep-original": "",
   "language": "语言",
   "latitude": "纬度",
diff --git a/web/src/routes/lists/edit/[id]/+page.svelte b/web/src/routes/lists/edit/[id]/+page.svelte
index f7f2c041..96b479e4 100644
--- a/web/src/routes/lists/edit/[id]/+page.svelte
+++ b/web/src/routes/lists/edit/[id]/+page.svelte
@@ -51,6 +51,7 @@
     let loading: boolean = $state(false);
 
     let newShares: TrailShare[] = [];
+    let publicList: boolean = $state(data.list?.public);
 
     let shareConfirmModal: ConfirmModal;
     let publishConfirmModal: ConfirmModal;
@@ -104,11 +105,8 @@
     });
 
     async function checkPrerequisites() {
-        if (
-            (data.list?.public === false && $formData.public === true) ||
-            ($formData.public === true &&
-                (data.list?.expand?.trails?.length ?? 0) <
-                    ($formData.expand?.trails?.length ?? 0))
+        if (    $formData.public === true && 
+                $formData.expand?.trails?.find(t => !t.public) !== undefined
         ) {
             publishConfirmModal.openModal();
             return false;
@@ -139,6 +137,7 @@
                 icon: "check",
                 text: $_("list-saved-successfully"),
             });
+            publicList = $formData.public;
         } catch (e) {
             show_toast({
                 type: "error",
@@ -334,7 +333,11 @@
             label={$_("description")}
             error={$errors.description}
         ></Editor>
-        <Toggle name="public" label={$_("public")}></Toggle>
+        <Toggle
+            name="public"
+            label={$formData.public ? $_("public") : $_("private")}
+            icon={$formData.public ? "globe" : "lock"}
+        ></Toggle>
         <h3 class="text-xl font-semibold">
             {$_("trail", { values: { n: 2 } })}
         </h3>
@@ -463,8 +466,13 @@
     action="confirm"
     bind:this={shareConfirmModal}
     onconfirm={async () => {
-        await updateTrailShares();
-        await saveList();
+        loading = true;
+        try {
+            await updateTrailShares();
+            await saveList();
+        } finally {
+            loading = false;
+        }
     }}
 ></ConfirmModal>
 
@@ -473,10 +481,24 @@
     text={$_("list-public-warning")}
     title={$_("confirm-publish")}
     action="confirm"
+    deny="keep-private"
     bind:this={publishConfirmModal}
     onconfirm={async () => {
-        await publishTrails();
-        await saveList();
+        loading = true;
+        try {
+            await publishTrails();
+            await saveList();
+        } finally {
+            loading = false;
+        }
+    }}
+    oncancel={async () => {
+        loading = true;
+        try {
+            await saveList();
+        } finally {
+            loading = false;
+        }
     }}
 ></ConfirmModal>