From fa7eea54d860bdc8e582b71407dbe270ba725c3c Mon Sep 17 00:00:00 2001
From: Timo <6156589+Shik3i@users.noreply.github.com>
Date: Wed, 1 Jul 2026 19:21:38 +0200
Subject: [PATCH] Split tab and media title privacy controls

---
 docs/CHANGELOG.md              |  2 +-
 docs/HOW_IT_WORKS.md           |  2 +-
 docs/PRIVACY.md                |  2 +-
 extension/background.js        | 40 ++++++++++++++--------------------
 extension/locales/de.json      | 10 ++++++---
 extension/locales/en.json      | 14 +++++++-----
 extension/locales/es.json      | 14 +++++++-----
 extension/locales/fr.json      | 14 +++++++-----
 extension/locales/it.json      | 14 +++++++-----
 extension/locales/ja.json      | 14 +++++++-----
 extension/locales/ko.json      | 14 +++++++-----
 extension/locales/nl.json      | 14 +++++++-----
 extension/locales/pl.json      | 14 +++++++-----
 extension/locales/pt-BR.json   | 14 +++++++-----
 extension/locales/pt.json      | 14 +++++++-----
 extension/locales/ru.json      | 14 +++++++-----
 extension/locales/tr.json      | 14 +++++++-----
 extension/locales/uk.json      | 14 +++++++-----
 extension/locales/zh.json      | 14 +++++++-----
 extension/popup.html           | 26 +++++++++++++++-------
 extension/popup.js             | 26 ++++++++++++++++------
 extension/title-privacy.js     | 12 +++++++++-
 scripts/test-title-privacy.mjs | 26 ++++++++++++++++------
 23 files changed, 219 insertions(+), 123 deletions(-)

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 35ba985..6b84b4f 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -7,7 +7,7 @@ All notable changes to the KoalaSync browser extension and relay server.
 ## Unreleased
 
 ### Added
-- **Extension: Shared title privacy setting** - Advanced users can now choose whether KoalaSync shares full tab/media titles, only detected episode identifiers such as `S01E04`, or no shared titles at all. The default remains full titles for backwards compatibility.
+- **Extension: Privacy title controls** - Advanced users can now disable sending browser tab titles separately from media titles. Media titles can still be sent in full, reduced to detected episode identifiers such as `S01E04`, or hidden entirely. Defaults remain full titles for backwards compatibility.
 
 ---
 
diff --git a/docs/HOW_IT_WORKS.md b/docs/HOW_IT_WORKS.md
index 46f8a94..fa41b44 100644
--- a/docs/HOW_IT_WORKS.md
+++ b/docs/HOW_IT_WORKS.md
@@ -184,7 +184,7 @@ When a user clicks **"Leave"** or closes their browser:
 When watching a series and an episode ends:
 
 1. `content.js` monitors the [Media Session API](https://developer.mozilla.org/en-US/docs/Web/API/Media_Session_API) for title changes.
-2. When a new title is detected, the peer broadcasts `EPISODE_LOBBY` with the expected title after applying the local Shared Titles privacy setting. In episode-only mode this is an identifier such as `S01E04`; in hidden mode the client does not create a new episode lobby.
+2. When a new title is detected, the peer broadcasts `EPISODE_LOBBY` with the expected title after applying the local media title privacy setting. In episode-only mode this is an identifier such as `S01E04`; when media titles are not sent, the client does not create a new episode lobby.
 3. All peers' videos freeze. The UI shows an "Episode Lobby" card with peer readiness status.
 4. Each peer's `content.js` polls for the new title to appear in the `<video>` element's metadata.
 5. Once a peer detects the matching title, they send `EPISODE_READY`.
diff --git a/docs/PRIVACY.md b/docs/PRIVACY.md
index 06a271c..d3a1893 100644
--- a/docs/PRIVACY.md
+++ b/docs/PRIVACY.md
@@ -8,7 +8,7 @@ KoalaSync is designed with a **Security-First & Volatile** architecture. This me
 
 ## 1. Data Processing (In-Memory Only)
 KoalaSync does not use a database. All active session data exists only in the server's RAM and is purged immediately when no longer needed.
-- **Session Data**: To synchronize playback, the server must temporarily hold your `peerId` and `username`. By default, KoalaSync also shares the selected tab title and media title with the room so peers can identify matching videos and coordinate episode transitions. You can change the Shared Titles privacy setting to send only a detected episode identifier (for example `S01E04`) or hide shared titles entirely. Playback metadata (`playbackState`, `currentTime`, `volume`, `muted`) is held per peer for the duration of the session. All of this is deleted as soon as you leave the room.
+- **Session Data**: To synchronize playback, the server must temporarily hold your `peerId` and `username`. By default, KoalaSync also shares the selected tab title and media title with the room so peers can identify matching videos and coordinate episode transitions. Privacy Settings let you disable sending the tab title separately, and choose whether media titles are sent in full, reduced to a detected episode identifier (for example `S01E04`), or not sent. Playback metadata (`playbackState`, `currentTime`, `volume`, `muted`) is held per peer for the duration of the session. All of this is deleted as soon as you leave the room.
 - **Room Passwords**: If you set a room password, it is stored only as an in-memory **keyed SHA-256 HMAC hash**. The server receives the plaintext password only during join validation, never stores it, and keeps only the hash for the short room lifetime.
 - **Routing Maps**: The server maintains ephemeral lookup tables (`socketToRoom`, `peerToSocket`) to route messages between peers. These contain only transport identifiers and are purged on disconnect.
 
diff --git a/extension/background.js b/extension/background.js
index 0173498..2b5f601 100644
--- a/extension/background.js
+++ b/extension/background.js
@@ -2,7 +2,7 @@ import { EVENTS, CONTROL_MODES, CAPABILITIES, PROTOCOL_VERSION, OFFICIAL_SERVER_
 import { generateUsername } from './shared/names.js';
 import { loadLocale, getMessage, getSystemLanguage } from './i18n.js';
 import { sameEpisode } from './episode-utils.js';
-import { applyTitlePrivacyToPayload, sanitizeSharedTitle, normalizeTitlePrivacyMode } from './title-privacy.js';
+import { applyTitlePrivacyToPayload, sanitizeSharedTitle, sanitizeTabTitle, normalizeSendTabTitle, normalizeTitlePrivacyMode } from './title-privacy.js';
 import { initTabManager } from './modules/tab-manager.js';
 
 // --- Uninstall URL Initialization ---
@@ -363,39 +363,41 @@ async function getSettings() {
     // (username) must NEVER come from storage.sync — syncing them across devices
     // both leaks them and resurrects dead rooms on reinstall (a fresh install
     // has empty local storage but sync survives in the user's Google account).
-    const data = await chrome.storage.local.get(['serverUrl', 'useCustomServer', 'roomId', 'password', 'username', 'titlePrivacyMode']);
+    const data = await chrome.storage.local.get(['serverUrl', 'useCustomServer', 'roomId', 'password', 'username', 'sendTabTitle', 'mediaTitlePrivacyMode', 'titlePrivacyMode']);
     let username = data.username;
     if (!username) {
         username = generateUsername();
         await chrome.storage.local.set({ username });
     }
+    const legacyTitlePrivacyMode = normalizeTitlePrivacyMode(data.titlePrivacyMode);
+    const mediaTitlePrivacyMode = normalizeTitlePrivacyMode(data.mediaTitlePrivacyMode || legacyTitlePrivacyMode);
     return {
         serverUrl: data.serverUrl || '',
         useCustomServer: data.useCustomServer || false,
         roomId: data.roomId || '',
         password: data.password || '',
         username,
-        titlePrivacyMode: normalizeTitlePrivacyMode(data.titlePrivacyMode)
+        sendTabTitle: normalizeSendTabTitle(data.sendTabTitle, legacyTitlePrivacyMode),
+        mediaTitlePrivacyMode
     };
 }
 
 function getSharedTitleFields(settings, mediaTitle = null) {
-    const mode = settings?.titlePrivacyMode;
     return {
-        tabTitle: sanitizeSharedTitle(currentTabTitle, mode),
-        mediaTitle: sanitizeSharedTitle(mediaTitle, mode)
+        tabTitle: sanitizeTabTitle(currentTabTitle, settings?.sendTabTitle),
+        mediaTitle: sanitizeSharedTitle(mediaTitle, settings?.mediaTitlePrivacyMode)
     };
 }
 
 function withTitlePrivacy(payload, settings, keys) {
-    return applyTitlePrivacyToPayload(payload, settings?.titlePrivacyMode, keys);
+    return applyTitlePrivacyToPayload(payload, settings?.mediaTitlePrivacyMode, keys);
 }
 
 function emitEpisodeLobbyForCurrentPrivacy() {
     if (!episodeLobby || episodeLobby.initiatorPeerId !== peerId) return;
     getSettings().then(settings => {
         if (!episodeLobby || episodeLobby.initiatorPeerId !== peerId) return;
-        const expectedTitle = sanitizeSharedTitle(episodeLobby.expectedTitle, settings.titlePrivacyMode);
+        const expectedTitle = sanitizeSharedTitle(episodeLobby.expectedTitle, settings.mediaTitlePrivacyMode);
         if (expectedTitle) {
             emit(EVENTS.EPISODE_LOBBY, { peerId, expectedTitle });
         }
@@ -412,7 +414,7 @@ const LEGACY_SYNC_KEYS = [
     'serverUrl', 'useCustomServer', 'roomId', 'password', 'username',
     'filterNoise', 'autoSyncNextEpisode', 'forceSyncMode',
     'browserNotifications', 'autoCopyInvite', 'locale', 'audioSettings',
-    'titlePrivacyMode'
+    'titlePrivacyMode', 'sendTabTitle', 'mediaTitlePrivacyMode'
 ];
 function purgeLegacySyncKeys() {
     chrome.storage.sync.remove(LEGACY_SYNC_KEYS).catch(() => {});
@@ -2242,9 +2244,9 @@ async function handleAsyncMessage(message, sender, sendResponse) {
         }
 
         const settings = await getSettings();
-        const lobbyTitle = sanitizeSharedTitle(newTitle, settings.titlePrivacyMode);
+        const lobbyTitle = sanitizeSharedTitle(newTitle, settings.mediaTitlePrivacyMode);
         if (!lobbyTitle) {
-            addLog(`Episode change detected but title sharing is ${settings.titlePrivacyMode}; not creating a lobby.`, 'info');
+            addLog(`Episode change detected but media title sharing is ${settings.mediaTitlePrivacyMode}; not creating a lobby.`, 'info');
             sendResponse({ status: 'title_privacy_no_lobby' });
             return;
         }
@@ -2330,7 +2332,7 @@ async function handleAsyncMessage(message, sender, sendResponse) {
         if (episodeLobby && message.payload && sameEpisode(message.payload.title, episodeLobby.expectedTitle)) {
             if (!episodeLobby.readyPeers.includes(peerId)) {
                 const settings = await getSettings();
-                const readyTitle = sanitizeSharedTitle(message.payload.title, settings.titlePrivacyMode);
+                const readyTitle = sanitizeSharedTitle(message.payload.title, settings.mediaTitlePrivacyMode);
                 episodeLobby.readyPeers.push(peerId);
                 persistEpisodeLobby();
                 broadcastLobbyUpdate();
@@ -2343,12 +2345,12 @@ async function handleAsyncMessage(message, sender, sendResponse) {
     } else if (message.type === 'TITLE_PRIVACY_CHANGED') {
         const settings = await getSettings();
         if (episodeLobby && episodeLobby.initiatorPeerId === peerId) {
-            const nextLobbyTitle = sanitizeSharedTitle(episodeLobby.expectedTitle, settings.titlePrivacyMode);
+            const nextLobbyTitle = sanitizeSharedTitle(episodeLobby.expectedTitle, settings.mediaTitlePrivacyMode);
             if (!nextLobbyTitle || nextLobbyTitle !== episodeLobby.expectedTitle) {
                 cancelEpisodeLobby('Title privacy changed');
             }
         }
-        if (currentRoom && settings.titlePrivacyMode === 'hidden') {
+        if (currentRoom) {
             const sharedTitles = getSharedTitleFields(settings);
             emit(EVENTS.PEER_STATUS, {
                 peerId,
@@ -2361,16 +2363,6 @@ async function handleAsyncMessage(message, sender, sendResponse) {
         }
         if (currentRoom && currentTabId) {
             chrome.tabs.sendMessage(currentTabId, { type: 'REQUEST_HEARTBEAT' }).catch(() => {});
-        } else if (currentRoom && settings.titlePrivacyMode !== 'hidden') {
-            const sharedTitles = getSharedTitleFields(settings);
-            emit(EVENTS.PEER_STATUS, {
-                peerId,
-                status: 'heartbeat',
-                username: settings.username,
-                tabTitle: sharedTitles.tabTitle,
-                mediaTitle: sharedTitles.mediaTitle,
-                desynced: hcmDesynced
-            });
         }
         sendResponse({ status: 'ok' });
     } else if (message.type === 'CONTENT_BOOT') {
diff --git a/extension/locales/de.json b/extension/locales/de.json
index d888e33..7c8eb95 100644
--- a/extension/locales/de.json
+++ b/extension/locales/de.json
@@ -230,9 +230,13 @@
   "BTN_RESTART_TOUR": "Einführung neu starten",
   "BTN_RESTART_TOUR_TOOLTIP": "Startet die Einführung für neue Benutzer erneut",
   "HINT_SELECT_VIDEO": "Wähle hier dein Video aus!",
-  "LABEL_TITLE_PRIVACY": "Tab-/Medientitel",
-  "LABEL_TITLE_PRIVACY_TOOLTIP": "Lege fest, ob Tab- und Medientitel an den Raum gesendet werden. Nicht senden leert beide Titel auf dem Server und deaktiviert Episoden-Lobbys durch deinen Client.",
   "OPTION_TITLE_PRIVACY_FULL": "Voll senden",
   "OPTION_TITLE_PRIVACY_EPISODE": "Nur Episoden-ID senden",
-  "OPTION_TITLE_PRIVACY_HIDDEN": "Nicht senden"
+  "OPTION_TITLE_PRIVACY_HIDDEN": "Nicht senden",
+  "LABEL_PRIVACY_SETTINGS": "Privatsphäre-Einstellungen",
+  "LABEL_PRIVACY_SETTINGS_TOOLTIP": "Lege fest, welche Tab- und Medientitel an den Raum gesendet werden.",
+  "LABEL_SEND_TAB_TITLE": "Tab-Titel senden",
+  "LABEL_SEND_TAB_TITLE_TOOLTIP": "Sendet den Titel des ausgewählten Browser-Tabs an den Raum.",
+  "LABEL_MEDIA_TITLE_PRIVACY": "Medientitel",
+  "LABEL_MEDIA_TITLE_PRIVACY_TOOLTIP": "Lege fest, wie Medientitel an den Raum gesendet werden."
 }
diff --git a/extension/locales/en.json b/extension/locales/en.json
index 11a2b43..9d041e4 100644
--- a/extension/locales/en.json
+++ b/extension/locales/en.json
@@ -230,9 +230,13 @@
   "BTN_RESTART_TOUR": "Restart Tutorial",
   "BTN_RESTART_TOUR_TOOLTIP": "Restart the onboarding tutorial",
   "HINT_SELECT_VIDEO": "Select your video here!",
-  "LABEL_TITLE_PRIVACY": "Tab/Media Titles",
-  "LABEL_TITLE_PRIVACY_TOOLTIP": "Choose whether tab and media titles are sent to the room. Do not send clears both titles on the server and disables episode lobbies from your client.",
-  "OPTION_TITLE_PRIVACY_FULL": "Send full titles",
-  "OPTION_TITLE_PRIVACY_EPISODE": "Send episode IDs",
-  "OPTION_TITLE_PRIVACY_HIDDEN": "Do not send"
+  "OPTION_TITLE_PRIVACY_FULL": "Send full title",
+  "OPTION_TITLE_PRIVACY_EPISODE": "Send episode ID",
+  "OPTION_TITLE_PRIVACY_HIDDEN": "Do not send",
+  "LABEL_PRIVACY_SETTINGS": "Privacy Settings",
+  "LABEL_PRIVACY_SETTINGS_TOOLTIP": "Choose which tab and media titles are sent to the room.",
+  "LABEL_SEND_TAB_TITLE": "Send tab title",
+  "LABEL_SEND_TAB_TITLE_TOOLTIP": "Send the selected browser tab title to the room.",
+  "LABEL_MEDIA_TITLE_PRIVACY": "Media title",
+  "LABEL_MEDIA_TITLE_PRIVACY_TOOLTIP": "Choose how media titles are sent to the room."
 }
diff --git a/extension/locales/es.json b/extension/locales/es.json
index 98bbe96..768e312 100644
--- a/extension/locales/es.json
+++ b/extension/locales/es.json
@@ -230,9 +230,13 @@
   "BTN_RESTART_TOUR": "Reiniciar tutorial",
   "BTN_RESTART_TOUR_TOOLTIP": "Reiniciar el tutorial de inicio",
   "HINT_SELECT_VIDEO": "¡Selecciona tu video aquí!",
-  "LABEL_TITLE_PRIVACY": "T?tulos compartidos",
-  "LABEL_TITLE_PRIVACY_TOOLTIP": "Elige c?mo se comparten los t?tulos de pesta?a y multimedia con la sala. El modo oculto borra los t?tulos del servidor y desactiva la creaci?n de salas de episodio desde tu cliente.",
-  "OPTION_TITLE_PRIVACY_FULL": "T?tulos completos",
-  "OPTION_TITLE_PRIVACY_EPISODE": "Solo episodio",
-  "OPTION_TITLE_PRIVACY_HIDDEN": "Ocultos"
+  "OPTION_TITLE_PRIVACY_FULL": "Enviar título completo",
+  "OPTION_TITLE_PRIVACY_EPISODE": "Enviar ID de episodio",
+  "OPTION_TITLE_PRIVACY_HIDDEN": "No enviar",
+  "LABEL_PRIVACY_SETTINGS": "Ajustes de privacidad",
+  "LABEL_PRIVACY_SETTINGS_TOOLTIP": "Elige qué títulos de pestaña y multimedia se envían a la sala.",
+  "LABEL_SEND_TAB_TITLE": "Enviar título de pestaña",
+  "LABEL_SEND_TAB_TITLE_TOOLTIP": "Envía a la sala el título de la pestaña del navegador seleccionada.",
+  "LABEL_MEDIA_TITLE_PRIVACY": "Título multimedia",
+  "LABEL_MEDIA_TITLE_PRIVACY_TOOLTIP": "Elige cómo se envían los títulos multimedia a la sala."
 }
diff --git a/extension/locales/fr.json b/extension/locales/fr.json
index 491c7ec..ec85121 100644
--- a/extension/locales/fr.json
+++ b/extension/locales/fr.json
@@ -230,9 +230,13 @@
   "BTN_RESTART_TOUR": "Redémarrer le tutoriel",
   "BTN_RESTART_TOUR_TOOLTIP": "Recommencer le tutoriel d'intégration",
   "HINT_SELECT_VIDEO": "Sélectionnez votre vidéo ici !",
-  "LABEL_TITLE_PRIVACY": "Titres partag?s",
-  "LABEL_TITLE_PRIVACY_TOOLTIP": "Choisissez comment les titres des onglets et des m?dias sont partag?s avec le salon. Le mode masqu? efface les titres du serveur et d?sactive la cr?ation de salons d??pisode depuis votre client.",
-  "OPTION_TITLE_PRIVACY_FULL": "Titres complets",
-  "OPTION_TITLE_PRIVACY_EPISODE": "?pisode seulement",
-  "OPTION_TITLE_PRIVACY_HIDDEN": "Masqu?s"
+  "OPTION_TITLE_PRIVACY_FULL": "Envoyer le titre complet",
+  "OPTION_TITLE_PRIVACY_EPISODE": "Envoyer l’identifiant d’épisode",
+  "OPTION_TITLE_PRIVACY_HIDDEN": "Ne pas envoyer",
+  "LABEL_PRIVACY_SETTINGS": "Paramètres de confidentialité",
+  "LABEL_PRIVACY_SETTINGS_TOOLTIP": "Choisissez quels titres d’onglet et de média sont envoyés au salon.",
+  "LABEL_SEND_TAB_TITLE": "Envoyer le titre de l’onglet",
+  "LABEL_SEND_TAB_TITLE_TOOLTIP": "Envoie au salon le titre de l’onglet de navigateur sélectionné.",
+  "LABEL_MEDIA_TITLE_PRIVACY": "Titre du média",
+  "LABEL_MEDIA_TITLE_PRIVACY_TOOLTIP": "Choisissez comment les titres des médias sont envoyés au salon."
 }
diff --git a/extension/locales/it.json b/extension/locales/it.json
index 9777564..cca98b9 100644
--- a/extension/locales/it.json
+++ b/extension/locales/it.json
@@ -230,9 +230,13 @@
   "BTN_RESTART_TOUR": "Riavvia Tutorial",
   "BTN_RESTART_TOUR_TOOLTIP": "Riavvia il tutorial introduttivo",
   "HINT_SELECT_VIDEO": "Scegli il tuo video qui!",
-  "LABEL_TITLE_PRIVACY": "Titoli condivisi",
-  "LABEL_TITLE_PRIVACY_TOOLTIP": "Scegli come condividere con la stanza i titoli delle schede e dei contenuti multimediali. La modalit? nascosta cancella i titoli sul server e disattiva la creazione di lobby episodio dal tuo client.",
-  "OPTION_TITLE_PRIVACY_FULL": "Titoli completi",
-  "OPTION_TITLE_PRIVACY_EPISODE": "Solo episodio",
-  "OPTION_TITLE_PRIVACY_HIDDEN": "Nascosti"
+  "OPTION_TITLE_PRIVACY_FULL": "Invia titolo completo",
+  "OPTION_TITLE_PRIVACY_EPISODE": "Invia ID episodio",
+  "OPTION_TITLE_PRIVACY_HIDDEN": "Non inviare",
+  "LABEL_PRIVACY_SETTINGS": "Impostazioni privacy",
+  "LABEL_PRIVACY_SETTINGS_TOOLTIP": "Scegli quali titoli di scheda e contenuto multimediale vengono inviati alla stanza.",
+  "LABEL_SEND_TAB_TITLE": "Invia titolo scheda",
+  "LABEL_SEND_TAB_TITLE_TOOLTIP": "Invia alla stanza il titolo della scheda del browser selezionata.",
+  "LABEL_MEDIA_TITLE_PRIVACY": "Titolo multimediale",
+  "LABEL_MEDIA_TITLE_PRIVACY_TOOLTIP": "Scegli come inviare alla stanza i titoli multimediali."
 }
diff --git a/extension/locales/ja.json b/extension/locales/ja.json
index f784484..67f7843 100644
--- a/extension/locales/ja.json
+++ b/extension/locales/ja.json
@@ -230,9 +230,13 @@
   "BTN_RESTART_TOUR": "チュートリアルを再起動",
   "BTN_RESTART_TOUR_TOOLTIP": "オンボーディングチュートリアルを再起動する",
   "HINT_SELECT_VIDEO": "ここで動画を選択してください！",
-  "LABEL_TITLE_PRIVACY": "??????",
-  "LABEL_TITLE_PRIVACY_TOOLTIP": "???????????????????????????????????????????????????????????????????????????????????",
-  "OPTION_TITLE_PRIVACY_FULL": "???????",
-  "OPTION_TITLE_PRIVACY_EPISODE": "???????",
-  "OPTION_TITLE_PRIVACY_HIDDEN": "???"
+  "OPTION_TITLE_PRIVACY_FULL": "完全なタイトルを送信",
+  "OPTION_TITLE_PRIVACY_EPISODE": "エピソードIDを送信",
+  "OPTION_TITLE_PRIVACY_HIDDEN": "送信しない",
+  "LABEL_PRIVACY_SETTINGS": "プライバシー設定",
+  "LABEL_PRIVACY_SETTINGS_TOOLTIP": "ルームに送信するタブタイトルとメディアタイトルを選択します。",
+  "LABEL_SEND_TAB_TITLE": "タブタイトルを送信",
+  "LABEL_SEND_TAB_TITLE_TOOLTIP": "選択中のブラウザータブのタイトルをルームに送信します。",
+  "LABEL_MEDIA_TITLE_PRIVACY": "メディアタイトル",
+  "LABEL_MEDIA_TITLE_PRIVACY_TOOLTIP": "メディアタイトルをルームに送信する方法を選択します。"
 }
diff --git a/extension/locales/ko.json b/extension/locales/ko.json
index fb3c79c..87e4356 100644
--- a/extension/locales/ko.json
+++ b/extension/locales/ko.json
@@ -230,9 +230,13 @@
   "BTN_RESTART_TOUR": "튜토리얼 다시 시작",
   "BTN_RESTART_TOUR_TOOLTIP": "온보딩 튜토리얼을 다시 시작합니다",
   "HINT_SELECT_VIDEO": "여기에서 비디오를 선택하세요!",
-  "LABEL_TITLE_PRIVACY": "?? ??",
-  "LABEL_TITLE_PRIVACY_TOOLTIP": "? ??? ??? ??? ?? ??? ???? ?????. ?? ??? ??? ??? ??? ? ??????? ???? ??? ??? ??? ???.",
-  "OPTION_TITLE_PRIVACY_FULL": "?? ??",
-  "OPTION_TITLE_PRIVACY_EPISODE": "?????",
-  "OPTION_TITLE_PRIVACY_HIDDEN": "??"
+  "OPTION_TITLE_PRIVACY_FULL": "전체 제목 보내기",
+  "OPTION_TITLE_PRIVACY_EPISODE": "에피소드 ID 보내기",
+  "OPTION_TITLE_PRIVACY_HIDDEN": "보내지 않음",
+  "LABEL_PRIVACY_SETTINGS": "개인정보 설정",
+  "LABEL_PRIVACY_SETTINGS_TOOLTIP": "방에 보낼 탭 제목과 미디어 제목을 선택합니다.",
+  "LABEL_SEND_TAB_TITLE": "탭 제목 보내기",
+  "LABEL_SEND_TAB_TITLE_TOOLTIP": "선택한 브라우저 탭 제목을 방에 보냅니다.",
+  "LABEL_MEDIA_TITLE_PRIVACY": "미디어 제목",
+  "LABEL_MEDIA_TITLE_PRIVACY_TOOLTIP": "미디어 제목을 방에 보내는 방식을 선택합니다."
 }
diff --git a/extension/locales/nl.json b/extension/locales/nl.json
index 7b9faa6..96bfc50 100644
--- a/extension/locales/nl.json
+++ b/extension/locales/nl.json
@@ -230,9 +230,13 @@
   "BTN_RESTART_TOUR": "Tutorial opnieuw starten",
   "BTN_RESTART_TOUR_TOOLTIP": "Start de introductie-tutorial opnieuw",
   "HINT_SELECT_VIDEO": "Selecteer hier je video!",
-  "LABEL_TITLE_PRIVACY": "Gedeelde titels",
-  "LABEL_TITLE_PRIVACY_TOOLTIP": "Kies hoe tab- en mediatitels met de kamer worden gedeeld. Verborgen modus wist titels op de server en schakelt het maken van afleveringslobby?s vanaf jouw client uit.",
-  "OPTION_TITLE_PRIVACY_FULL": "Volledige titels",
-  "OPTION_TITLE_PRIVACY_EPISODE": "Alleen aflevering",
-  "OPTION_TITLE_PRIVACY_HIDDEN": "Verborgen"
+  "OPTION_TITLE_PRIVACY_FULL": "Volledige titel verzenden",
+  "OPTION_TITLE_PRIVACY_EPISODE": "Afleverings-ID verzenden",
+  "OPTION_TITLE_PRIVACY_HIDDEN": "Niet verzenden",
+  "LABEL_PRIVACY_SETTINGS": "Privacy-instellingen",
+  "LABEL_PRIVACY_SETTINGS_TOOLTIP": "Kies welke tab- en mediatitels naar de kamer worden gestuurd.",
+  "LABEL_SEND_TAB_TITLE": "Tabtitel verzenden",
+  "LABEL_SEND_TAB_TITLE_TOOLTIP": "Stuurt de titel van het geselecteerde browsertabblad naar de kamer.",
+  "LABEL_MEDIA_TITLE_PRIVACY": "Mediatitel",
+  "LABEL_MEDIA_TITLE_PRIVACY_TOOLTIP": "Kies hoe mediatitels naar de kamer worden gestuurd."
 }
diff --git a/extension/locales/pl.json b/extension/locales/pl.json
index 908aef4..ceb4aa1 100644
--- a/extension/locales/pl.json
+++ b/extension/locales/pl.json
@@ -230,9 +230,13 @@
   "BTN_RESTART_TOUR": "Uruchom samouczek ponownie",
   "BTN_RESTART_TOUR_TOOLTIP": "Uruchom ponownie samouczek powitalny",
   "HINT_SELECT_VIDEO": "Wybierz swoje wideo tutaj!",
-  "LABEL_TITLE_PRIVACY": "Udost?pniane tytu?y",
-  "LABEL_TITLE_PRIVACY_TOOLTIP": "Wybierz, jak tytu?y kart i multimedi?w s? udost?pniane w pokoju. Tryb ukryty czy?ci tytu?y na serwerze i wy??cza tworzenie poczekalni odcinka z tego klienta.",
-  "OPTION_TITLE_PRIVACY_FULL": "Pe?ne tytu?y",
-  "OPTION_TITLE_PRIVACY_EPISODE": "Tylko odcinek",
-  "OPTION_TITLE_PRIVACY_HIDDEN": "Ukryte"
+  "OPTION_TITLE_PRIVACY_FULL": "Wysyłaj pełny tytuł",
+  "OPTION_TITLE_PRIVACY_EPISODE": "Wysyłaj ID odcinka",
+  "OPTION_TITLE_PRIVACY_HIDDEN": "Nie wysyłaj",
+  "LABEL_PRIVACY_SETTINGS": "Ustawienia prywatności",
+  "LABEL_PRIVACY_SETTINGS_TOOLTIP": "Wybierz, które tytuły kart i multimediów są wysyłane do pokoju.",
+  "LABEL_SEND_TAB_TITLE": "Wysyłaj tytuł karty",
+  "LABEL_SEND_TAB_TITLE_TOOLTIP": "Wysyła do pokoju tytuł wybranej karty przeglądarki.",
+  "LABEL_MEDIA_TITLE_PRIVACY": "Tytuł multimediów",
+  "LABEL_MEDIA_TITLE_PRIVACY_TOOLTIP": "Wybierz, jak tytuły multimediów są wysyłane do pokoju."
 }
diff --git a/extension/locales/pt-BR.json b/extension/locales/pt-BR.json
index b08d5ec..5556955 100644
--- a/extension/locales/pt-BR.json
+++ b/extension/locales/pt-BR.json
@@ -230,9 +230,13 @@
   "BTN_RESTART_TOUR": "Reiniciar tutorial",
   "BTN_RESTART_TOUR_TOOLTIP": "Reiniciar o tutorial de introdução",
   "HINT_SELECT_VIDEO": "Selecione seu vídeo aqui!",
-  "LABEL_TITLE_PRIVACY": "T?tulos compartilhados",
-  "LABEL_TITLE_PRIVACY_TOOLTIP": "Escolha como os t?tulos da aba e da m?dia s?o compartilhados com a sala. O modo oculto limpa os t?tulos no servidor e desativa a cria??o de lobby de epis?dio pelo seu cliente.",
-  "OPTION_TITLE_PRIVACY_FULL": "T?tulos completos",
-  "OPTION_TITLE_PRIVACY_EPISODE": "S? epis?dio",
-  "OPTION_TITLE_PRIVACY_HIDDEN": "Ocultos"
+  "OPTION_TITLE_PRIVACY_FULL": "Enviar título completo",
+  "OPTION_TITLE_PRIVACY_EPISODE": "Enviar ID do episódio",
+  "OPTION_TITLE_PRIVACY_HIDDEN": "Não enviar",
+  "LABEL_PRIVACY_SETTINGS": "Configurações de privacidade",
+  "LABEL_PRIVACY_SETTINGS_TOOLTIP": "Escolha quais títulos de aba e mídia são enviados para a sala.",
+  "LABEL_SEND_TAB_TITLE": "Enviar título da aba",
+  "LABEL_SEND_TAB_TITLE_TOOLTIP": "Envia para a sala o título da aba selecionada do navegador.",
+  "LABEL_MEDIA_TITLE_PRIVACY": "Título da mídia",
+  "LABEL_MEDIA_TITLE_PRIVACY_TOOLTIP": "Escolha como os títulos de mídia são enviados para a sala."
 }
diff --git a/extension/locales/pt.json b/extension/locales/pt.json
index 3228382..b6426dd 100644
--- a/extension/locales/pt.json
+++ b/extension/locales/pt.json
@@ -230,9 +230,13 @@
   "BTN_RESTART_TOUR": "Reiniciar Tutorial",
   "BTN_RESTART_TOUR_TOOLTIP": "Reiniciar o tutorial introdutório",
   "HINT_SELECT_VIDEO": "Selecione o seu vídeo aqui!",
-  "LABEL_TITLE_PRIVACY": "T?tulos partilhados",
-  "LABEL_TITLE_PRIVACY_TOOLTIP": "Escolhe como os t?tulos do separador e do conte?do multim?dia s?o partilhados com a sala. O modo oculto limpa os t?tulos no servidor e desativa a cria??o de salas de epis?dio pelo teu cliente.",
-  "OPTION_TITLE_PRIVACY_FULL": "T?tulos completos",
-  "OPTION_TITLE_PRIVACY_EPISODE": "S? epis?dio",
-  "OPTION_TITLE_PRIVACY_HIDDEN": "Ocultos"
+  "OPTION_TITLE_PRIVACY_FULL": "Enviar título completo",
+  "OPTION_TITLE_PRIVACY_EPISODE": "Enviar ID do episódio",
+  "OPTION_TITLE_PRIVACY_HIDDEN": "Não enviar",
+  "LABEL_PRIVACY_SETTINGS": "Definições de privacidade",
+  "LABEL_PRIVACY_SETTINGS_TOOLTIP": "Escolhe que títulos do separador e do conteúdo multimédia são enviados para a sala.",
+  "LABEL_SEND_TAB_TITLE": "Enviar título do separador",
+  "LABEL_SEND_TAB_TITLE_TOOLTIP": "Envia para a sala o título do separador do navegador selecionado.",
+  "LABEL_MEDIA_TITLE_PRIVACY": "Título multimédia",
+  "LABEL_MEDIA_TITLE_PRIVACY_TOOLTIP": "Escolhe como os títulos multimédia são enviados para a sala."
 }
diff --git a/extension/locales/ru.json b/extension/locales/ru.json
index b4d655e..9660bd3 100644
--- a/extension/locales/ru.json
+++ b/extension/locales/ru.json
@@ -230,9 +230,13 @@
   "BTN_RESTART_TOUR": "Перезапустить обучение",
   "BTN_RESTART_TOUR_TOOLTIP": "Запустить приветственное руководство заново",
   "HINT_SELECT_VIDEO": "Выберите ваше видео здесь!",
-  "LABEL_TITLE_PRIVACY": "????? ????????",
-  "LABEL_TITLE_PRIVACY_TOOLTIP": "????????, ??? ???????? ??????? ? ????? ?????????? ? ???????. ??????? ????? ??????? ???????? ?? ??????? ? ????????? ???????? ????? ???????? ? ?????? ???????.",
-  "OPTION_TITLE_PRIVACY_FULL": "?????? ????????",
-  "OPTION_TITLE_PRIVACY_EPISODE": "?????? ??????",
-  "OPTION_TITLE_PRIVACY_HIDDEN": "??????"
+  "OPTION_TITLE_PRIVACY_FULL": "Отправлять полное название",
+  "OPTION_TITLE_PRIVACY_EPISODE": "Отправлять ID эпизода",
+  "OPTION_TITLE_PRIVACY_HIDDEN": "Не отправлять",
+  "LABEL_PRIVACY_SETTINGS": "Настройки приватности",
+  "LABEL_PRIVACY_SETTINGS_TOOLTIP": "Выберите, какие названия вкладки и медиа отправляются в комнату.",
+  "LABEL_SEND_TAB_TITLE": "Отправлять название вкладки",
+  "LABEL_SEND_TAB_TITLE_TOOLTIP": "Отправляет в комнату название выбранной вкладки браузера.",
+  "LABEL_MEDIA_TITLE_PRIVACY": "Название медиа",
+  "LABEL_MEDIA_TITLE_PRIVACY_TOOLTIP": "Выберите, как названия медиа отправляются в комнату."
 }
diff --git a/extension/locales/tr.json b/extension/locales/tr.json
index e63baf2..2cb5101 100644
--- a/extension/locales/tr.json
+++ b/extension/locales/tr.json
@@ -230,9 +230,13 @@
   "BTN_RESTART_TOUR": "Eğitimi Yeniden Başlat",
   "BTN_RESTART_TOUR_TOOLTIP": "Tanıtım eğitimini yeniden başlat",
   "HINT_SELECT_VIDEO": "Videonuzu buradan seçin!",
-  "LABEL_TITLE_PRIVACY": "Payla??lan ba?l?klar",
-  "LABEL_TITLE_PRIVACY_TOOLTIP": "Sekme ve medya ba?l?klar?n?n odayla nas?l payla??laca??n? se?in. Gizli mod sunucudaki ba?l?klar? temizler ve istemcinizden b?l?m lobisi olu?turmay? devre d??? b?rak?r.",
-  "OPTION_TITLE_PRIVACY_FULL": "Tam ba?l?klar",
-  "OPTION_TITLE_PRIVACY_EPISODE": "Sadece b?l?m",
-  "OPTION_TITLE_PRIVACY_HIDDEN": "Gizli"
+  "OPTION_TITLE_PRIVACY_FULL": "Tam başlığı gönder",
+  "OPTION_TITLE_PRIVACY_EPISODE": "Bölüm ID’sini gönder",
+  "OPTION_TITLE_PRIVACY_HIDDEN": "Gönderme",
+  "LABEL_PRIVACY_SETTINGS": "Gizlilik ayarları",
+  "LABEL_PRIVACY_SETTINGS_TOOLTIP": "Odaya hangi sekme ve medya başlıklarının gönderileceğini seçin.",
+  "LABEL_SEND_TAB_TITLE": "Sekme başlığını gönder",
+  "LABEL_SEND_TAB_TITLE_TOOLTIP": "Seçili tarayıcı sekmesinin başlığını odaya gönderir.",
+  "LABEL_MEDIA_TITLE_PRIVACY": "Medya başlığı",
+  "LABEL_MEDIA_TITLE_PRIVACY_TOOLTIP": "Medya başlıklarının odaya nasıl gönderileceğini seçin."
 }
diff --git a/extension/locales/uk.json b/extension/locales/uk.json
index 3321bc7..3de331b 100644
--- a/extension/locales/uk.json
+++ b/extension/locales/uk.json
@@ -230,9 +230,13 @@
   "BTN_RESTART_TOUR": "Перезапустіть підручник",
   "BTN_RESTART_TOUR_TOOLTIP": "Перезапустіть навчальний посібник із адаптації",
   "HINT_SELECT_VIDEO": "Виберіть своє відео тут!",
-  "LABEL_TITLE_PRIVACY": "??????? ?????",
-  "LABEL_TITLE_PRIVACY_TOOLTIP": "????????, ?? ????? ??????? ? ????? ??????????? ?? ???????. ?????????? ????? ?????? ????? ?? ??????? ? ??????? ????????? ???? ???????? ?? ?????? ???????.",
-  "OPTION_TITLE_PRIVACY_FULL": "????? ?????",
-  "OPTION_TITLE_PRIVACY_EPISODE": "???? ??????",
-  "OPTION_TITLE_PRIVACY_HIDDEN": "?????????"
+  "OPTION_TITLE_PRIVACY_FULL": "Надсилати повну назву",
+  "OPTION_TITLE_PRIVACY_EPISODE": "Надсилати ID епізоду",
+  "OPTION_TITLE_PRIVACY_HIDDEN": "Не надсилати",
+  "LABEL_PRIVACY_SETTINGS": "Налаштування приватності",
+  "LABEL_PRIVACY_SETTINGS_TOOLTIP": "Виберіть, які назви вкладки й медіа надсилати до кімнати.",
+  "LABEL_SEND_TAB_TITLE": "Надсилати назву вкладки",
+  "LABEL_SEND_TAB_TITLE_TOOLTIP": "Надсилає до кімнати назву вибраної вкладки браузера.",
+  "LABEL_MEDIA_TITLE_PRIVACY": "Назва медіа",
+  "LABEL_MEDIA_TITLE_PRIVACY_TOOLTIP": "Виберіть, як назви медіа надсилати до кімнати."
 }
diff --git a/extension/locales/zh.json b/extension/locales/zh.json
index 9b2b2e3..7330d74 100644
--- a/extension/locales/zh.json
+++ b/extension/locales/zh.json
@@ -230,9 +230,13 @@
   "BTN_RESTART_TOUR": "重启教程",
   "BTN_RESTART_TOUR_TOOLTIP": "重新启动入门教程",
   "HINT_SELECT_VIDEO": "在这里选择您的视频！",
-  "LABEL_TITLE_PRIVACY": "????",
-  "LABEL_TITLE_PRIVACY_TOOLTIP": "??????????????????????????????????????????????????",
-  "OPTION_TITLE_PRIVACY_FULL": "????",
-  "OPTION_TITLE_PRIVACY_EPISODE": "???",
-  "OPTION_TITLE_PRIVACY_HIDDEN": "??"
+  "OPTION_TITLE_PRIVACY_FULL": "发送完整标题",
+  "OPTION_TITLE_PRIVACY_EPISODE": "发送剧集 ID",
+  "OPTION_TITLE_PRIVACY_HIDDEN": "不发送",
+  "LABEL_PRIVACY_SETTINGS": "隐私设置",
+  "LABEL_PRIVACY_SETTINGS_TOOLTIP": "选择要发送到房间的标签页标题和媒体标题。",
+  "LABEL_SEND_TAB_TITLE": "发送标签页标题",
+  "LABEL_SEND_TAB_TITLE_TOOLTIP": "将所选浏览器标签页的标题发送到房间。",
+  "LABEL_MEDIA_TITLE_PRIVACY": "媒体标题",
+  "LABEL_MEDIA_TITLE_PRIVACY_TOOLTIP": "选择媒体标题发送到房间的方式。"
 }
diff --git a/extension/popup.html b/extension/popup.html
index 6ec1280..f0f7397 100644
--- a/extension/popup.html
+++ b/extension/popup.html
@@ -566,14 +566,24 @@
             </label>
         </div>
 
-        <div class="form-group" style="display: flex; align-items: center; justify-content: space-between; gap: 12px; background: var(--card); padding: 10px; border-radius: 8px; margin-bottom: 12px; border: 1px solid #334155;">
-            <label style="margin-bottom: 0; cursor: help;" title="Choose whether tab and media titles are sent to the room." data-i18n="LABEL_TITLE_PRIVACY" data-i18n-title="LABEL_TITLE_PRIVACY_TOOLTIP">Tab/Media Titles</label>
-            <select id="titlePrivacyMode" style="width: 165px; background: var(--bg); border: 1px solid #334155; color: white; padding: 6px 10px; border-radius: 8px; font-size: 12px; cursor: pointer; outline: none; font-family: inherit;">
-                <option value="full" data-i18n="OPTION_TITLE_PRIVACY_FULL">Send full titles</option>
-                <option value="episode" data-i18n="OPTION_TITLE_PRIVACY_EPISODE">Send episode IDs</option>
-                <option value="hidden" data-i18n="OPTION_TITLE_PRIVACY_HIDDEN">Do not send</option>
-            </select>
-        </div>
+        <details class="form-group" style="background: var(--card); padding: 10px; border-radius: 8px; margin-bottom: 12px; border: 1px solid #334155;">
+            <summary style="cursor: pointer; font-size: 12px; font-weight: 700; color: var(--text);" title="Choose which titles are sent to the room." data-i18n="LABEL_PRIVACY_SETTINGS" data-i18n-title="LABEL_PRIVACY_SETTINGS_TOOLTIP">Privacy Settings</summary>
+            <div style="display: flex; align-items: center; justify-content: space-between; gap: 12px; margin-top: 10px;">
+                <label style="margin-bottom: 0; cursor: help;" title="Send the selected browser tab title to the room." data-i18n="LABEL_SEND_TAB_TITLE" data-i18n-title="LABEL_SEND_TAB_TITLE_TOOLTIP">Send tab title</label>
+                <label class="toggle-switch">
+                    <input type="checkbox" id="sendTabTitle" checked>
+                    <span class="slider"></span>
+                </label>
+            </div>
+            <div style="display: flex; align-items: center; justify-content: space-between; gap: 12px; margin-top: 10px;">
+                <label style="margin-bottom: 0; cursor: help;" title="Choose how media titles are sent to the room." data-i18n="LABEL_MEDIA_TITLE_PRIVACY" data-i18n-title="LABEL_MEDIA_TITLE_PRIVACY_TOOLTIP">Media title</label>
+                <select id="mediaTitlePrivacyMode" style="width: 165px; background: var(--bg); border: 1px solid #334155; color: white; padding: 6px 10px; border-radius: 8px; font-size: 12px; cursor: pointer; outline: none; font-family: inherit;">
+                    <option value="full" data-i18n="OPTION_TITLE_PRIVACY_FULL">Send full title</option>
+                    <option value="episode" data-i18n="OPTION_TITLE_PRIVACY_EPISODE">Send episode ID</option>
+                    <option value="hidden" data-i18n="OPTION_TITLE_PRIVACY_HIDDEN">Do not send</option>
+                </select>
+            </div>
+        </details>
 
         <div class="form-group" style="display: flex; align-items: center; justify-content: space-between; background: var(--card); padding: 10px; border-radius: 8px; margin-bottom: 12px; border: 1px solid #334155;">
             <label style="margin-bottom: 0; cursor: help;" title="Automatically copies the invite link to your clipboard when creating a new room." data-i18n="LABEL_AUTO_COPY_INVITE" data-i18n-title="LABEL_AUTO_COPY_INVITE_TOOLTIP">Auto-Copy Invite Link</label>
diff --git a/extension/popup.js b/extension/popup.js
index f725b74..a9e2952 100644
--- a/extension/popup.js
+++ b/extension/popup.js
@@ -2,7 +2,7 @@ import { EVENTS, OFFICIAL_LANDING_PAGE_URL, SUPPORT_URL, getReviewUrl } from './
 import { BLACKLIST_DOMAINS } from './shared/blacklist.js';
 import { getAvatarForName, generateUsername, USERNAME_ADJECTIVES, USERNAME_NOUNS } from './shared/names.js';
 import { loadLocale, translateDOM, getMessage, getSystemLanguage } from './i18n.js';
-import { TITLE_PRIVACY_MODES } from './title-privacy.js';
+import { TITLE_PRIVACY_MODES, normalizeSendTabTitle } from './title-privacy.js';
 
 
 const elements = {
@@ -55,7 +55,8 @@ const elements = {
     playBtn: document.getElementById('playBtn'),
     pauseBtn: document.getElementById('pauseBtn'),
     autoSyncNextEpisode: document.getElementById('autoSyncNextEpisode'),
-    titlePrivacyMode: document.getElementById('titlePrivacyMode'),
+    sendTabTitle: document.getElementById('sendTabTitle'),
+    mediaTitlePrivacyMode: document.getElementById('mediaTitlePrivacyMode'),
     episodeLobbyCard: document.getElementById('episodeLobbyCard'),
     lobbyTitle: document.getElementById('lobbyTitle'),
     lobbyPeerStatus: document.getElementById('lobbyPeerStatus'),
@@ -186,7 +187,7 @@ function setRoomRefreshCooldown() {
 async function init() {
     // Local-only by design — settings and room credentials never come from
     // storage.sync (only onboardingComplete + dismissedHints live there).
-    const localData = await chrome.storage.local.get(['serverUrl', 'useCustomServer', 'roomId', 'password', 'username', 'filterNoise', 'autoSyncNextEpisode', 'titlePrivacyMode', 'forceSyncMode', 'browserNotifications', 'autoCopyInvite', 'locale', 'audioSettings', 'activeTab']);
+    const localData = await chrome.storage.local.get(['serverUrl', 'useCustomServer', 'roomId', 'password', 'username', 'filterNoise', 'autoSyncNextEpisode', 'sendTabTitle', 'mediaTitlePrivacyMode', 'titlePrivacyMode', 'forceSyncMode', 'browserNotifications', 'autoCopyInvite', 'locale', 'audioSettings', 'activeTab']);
 
     let activeLang = localData.locale;
     if (!activeLang) {
@@ -211,7 +212,10 @@ async function init() {
     elements.username.value = username;
     if (elements.filterNoise) elements.filterNoise.checked = localData.filterNoise !== false;
     if (elements.autoSyncNextEpisode) elements.autoSyncNextEpisode.checked = localData.autoSyncNextEpisode !== false;
-    if (elements.titlePrivacyMode) elements.titlePrivacyMode.value = Object.values(TITLE_PRIVACY_MODES).includes(localData.titlePrivacyMode) ? localData.titlePrivacyMode : 'full';
+    const legacyTitlePrivacyMode = Object.values(TITLE_PRIVACY_MODES).includes(localData.titlePrivacyMode) ? localData.titlePrivacyMode : TITLE_PRIVACY_MODES.FULL;
+    const mediaTitlePrivacyMode = Object.values(TITLE_PRIVACY_MODES).includes(localData.mediaTitlePrivacyMode) ? localData.mediaTitlePrivacyMode : legacyTitlePrivacyMode;
+    if (elements.sendTabTitle) elements.sendTabTitle.checked = normalizeSendTabTitle(localData.sendTabTitle, legacyTitlePrivacyMode);
+    if (elements.mediaTitlePrivacyMode) elements.mediaTitlePrivacyMode.value = mediaTitlePrivacyMode;
     if (elements.forceSyncMode) elements.forceSyncMode.value = localData.forceSyncMode || 'jump-to-others';
     if (elements.browserNotifications) elements.browserNotifications.checked = localData.browserNotifications === true;
     if (elements.autoCopyInvite) elements.autoCopyInvite.checked = localData.autoCopyInvite !== false;
@@ -1225,9 +1229,17 @@ elements.autoSyncNextEpisode.addEventListener('change', () => {
     chrome.storage.local.set({ autoSyncNextEpisode: elements.autoSyncNextEpisode.checked });
 });
 
-if (elements.titlePrivacyMode) {
-    elements.titlePrivacyMode.addEventListener('change', () => {
-        chrome.storage.local.set({ titlePrivacyMode: elements.titlePrivacyMode.value }, () => {
+if (elements.sendTabTitle) {
+    elements.sendTabTitle.addEventListener('change', () => {
+        chrome.storage.local.set({ sendTabTitle: elements.sendTabTitle.checked }, () => {
+            chrome.runtime.sendMessage({ type: 'TITLE_PRIVACY_CHANGED' }).catch(() => {});
+        });
+    });
+}
+
+if (elements.mediaTitlePrivacyMode) {
+    elements.mediaTitlePrivacyMode.addEventListener('change', () => {
+        chrome.storage.local.set({ mediaTitlePrivacyMode: elements.mediaTitlePrivacyMode.value }, () => {
             chrome.runtime.sendMessage({ type: 'TITLE_PRIVACY_CHANGED' }).catch(() => {});
         });
     });
diff --git a/extension/title-privacy.js b/extension/title-privacy.js
index a4b5eba..54a4f99 100644
--- a/extension/title-privacy.js
+++ b/extension/title-privacy.js
@@ -12,6 +12,16 @@ export function normalizeTitlePrivacyMode(mode) {
         : TITLE_PRIVACY_MODES.FULL;
 }
 
+export function normalizeSendTabTitle(sendTabTitle, legacyMode = TITLE_PRIVACY_MODES.FULL) {
+    if (typeof sendTabTitle === 'boolean') return sendTabTitle;
+    return normalizeTitlePrivacyMode(legacyMode) === TITLE_PRIVACY_MODES.FULL;
+}
+
+export function sanitizeTabTitle(title, sendTabTitle) {
+    if (!sendTabTitle) return null;
+    return typeof title === 'string' && title.length > 0 ? title : null;
+}
+
 export function sanitizeSharedTitle(title, mode) {
     const normalizedMode = normalizeTitlePrivacyMode(mode);
     if (normalizedMode === TITLE_PRIVACY_MODES.HIDDEN) return null;
@@ -23,7 +33,7 @@ export function sanitizeSharedTitle(title, mode) {
     return title;
 }
 
-export function applyTitlePrivacyToPayload(payload, mode, keys = ['tabTitle', 'mediaTitle', 'expectedTitle', 'title']) {
+export function applyTitlePrivacyToPayload(payload, mode, keys = ['mediaTitle', 'expectedTitle', 'title']) {
     const source = payload && typeof payload === 'object' ? payload : {};
     const next = { ...source };
     keys.forEach(key => {
diff --git a/scripts/test-title-privacy.mjs b/scripts/test-title-privacy.mjs
index 8f1fce1..77565bd 100644
--- a/scripts/test-title-privacy.mjs
+++ b/scripts/test-title-privacy.mjs
@@ -2,13 +2,23 @@ import assert from 'node:assert/strict';
 import {
     TITLE_PRIVACY_MODES,
     applyTitlePrivacyToPayload,
+    normalizeSendTabTitle,
     normalizeTitlePrivacyMode,
-    sanitizeSharedTitle
+    sanitizeSharedTitle,
+    sanitizeTabTitle
 } from '../extension/title-privacy.js';
 
 assert.equal(normalizeTitlePrivacyMode(undefined), TITLE_PRIVACY_MODES.FULL);
 assert.equal(normalizeTitlePrivacyMode('unknown'), TITLE_PRIVACY_MODES.FULL);
 assert.equal(normalizeTitlePrivacyMode(TITLE_PRIVACY_MODES.HIDDEN), TITLE_PRIVACY_MODES.HIDDEN);
+assert.equal(normalizeSendTabTitle(undefined, TITLE_PRIVACY_MODES.FULL), true);
+assert.equal(normalizeSendTabTitle(undefined, TITLE_PRIVACY_MODES.EPISODE), false);
+assert.equal(normalizeSendTabTitle(true, TITLE_PRIVACY_MODES.HIDDEN), true);
+assert.equal(normalizeSendTabTitle(false, TITLE_PRIVACY_MODES.FULL), false);
+
+assert.equal(sanitizeTabTitle('Private Tab', true), 'Private Tab');
+assert.equal(sanitizeTabTitle('Private Tab', false), null);
+assert.equal(sanitizeTabTitle('', true), null);
 
 assert.equal(sanitizeSharedTitle('Example Movie', 'full'), 'Example Movie');
 assert.equal(sanitizeSharedTitle('', 'full'), null);
@@ -28,10 +38,11 @@ assert.deepEqual(
         currentTime: 42
     }, 'episode'),
     {
-        tabTitle: 'S01E04',
+        tabTitle: 'Private Jellyfin - S01E04',
         mediaTitle: 'S01E04',
         currentTime: 42
-    }
+    },
+    'media privacy must not rewrite tabTitle'
 );
 
 assert.deepEqual(
@@ -40,10 +51,10 @@ assert.deepEqual(
         status: 'heartbeat'
     }, 'episode'),
     {
-        tabTitle: 'S01E04',
+        tabTitle: 'Private Jellyfin - S01E04',
         status: 'heartbeat'
     },
-    'privacy filtering must not add absent title keys'
+    'media privacy must not rewrite tabTitle or add absent media keys'
 );
 
 assert.deepEqual(
@@ -54,11 +65,12 @@ assert.deepEqual(
         title: 'S01E04'
     }, 'hidden'),
     {
-        tabTitle: null,
+        tabTitle: 'Private Tab',
         mediaTitle: null,
         expectedTitle: null,
         title: null
-    }
+    },
+    'hidden media privacy must not clear tabTitle'
 );
 
 console.log('title-privacy tests passed');