From 5cf597dcfe9bd883ea7f07462e477ed3c263120e Mon Sep 17 00:00:00 2001
From: xacnio <me@xacnio.dev>
Date: Thu, 26 Mar 2026 01:47:56 +0300
Subject: [PATCH] Add folder-based split tunneling support

---
 .../Strings/ar-SA/Resources.resw              |   9 +
 .../Strings/be-BY/Resources.resw              |   9 +
 .../Strings/ca-ES/Resources.resw              |   9 +
 .../Strings/cs-CZ/Resources.resw              |   9 +
 .../Strings/da-DK/Resources.resw              |   9 +
 .../Strings/de-DE/Resources.resw              |   9 +
 .../Strings/el-GR/Resources.resw              |   9 +
 .../Strings/en-US/Resources.resw              |  12 +-
 .../Strings/es-419/Resources.resw             |   9 +
 .../Strings/es-ES/Resources.resw              |   9 +
 .../Strings/fa-IR/Resources.resw              |   9 +
 .../Strings/fi-FI/Resources.resw              |   9 +
 .../Strings/fr-FR/Resources.resw              |   9 +
 .../Strings/hu-HU/Resources.resw              |   9 +
 .../Strings/id-ID/Resources.resw              |   9 +
 .../Strings/it-IT/Resources.resw              |   9 +
 .../Strings/ja-JP/Resources.resw              |   9 +
 .../Strings/ka-GE/Resources.resw              |   9 +
 .../Strings/ko-KR/Resources.resw              |   9 +
 .../Strings/nb-NO/Resources.resw              |   9 +
 .../Strings/nl-NL/Resources.resw              |   9 +
 .../Strings/pl-PL/Resources.resw              |   9 +
 .../Strings/pt-BR/Resources.resw              |   9 +
 .../Strings/pt-PT/Resources.resw              |   9 +
 .../Strings/ro-RO/Resources.resw              |   9 +
 .../Strings/ru-RU/Resources.resw              |   9 +
 .../Strings/sk-SK/Resources.resw              |   9 +
 .../Strings/sl-SI/Resources.resw              |   9 +
 .../Strings/sv-SE/Resources.resw              |   9 +
 .../Strings/tr-TR/Resources.resw              |  11 +-
 .../Strings/uk-UA/Resources.resw              |   9 +
 .../Strings/zh-CN/Resources.resw              |   9 +
 .../Strings/zh-TW/Resources.resw              |   9 +
 .../MainSettingsRequestCreator.cs             |  49 ++-
 .../IVpnServiceCaller.cs                      |   5 +-
 .../VpnServiceCaller.cs                       |  12 +-
 .../Extensions/WindowExtensions.cs            |  19 +-
 .../SplitTunneling/FolderWatcherService.cs    | 376 ++++++++++++++++++
 .../SplitTunneling/IFolderWatcherService.cs   |  64 +++
 .../SplitTunnelingFolderOrchestrator.cs       | 214 ++++++++++
 .../ProtonVPN.Client/Installers/AppModule.cs  |   4 +-
 .../SplitTunnelingFolderViewModel.cs          |  79 ++++
 .../Connection/SplitTunnelingPageView.xaml    | 147 +++++++
 .../Connection/SplitTunnelingPageViewModel.cs | 111 +++++-
 .../DefaultSettings.cs                        |   3 +-
 .../IUserSettings.cs                          |   4 +-
 .../Models/SplitTunnelingFolder.cs            |  55 +++
 .../ProtonVPN.Client.Settings/UserSettings.cs |  14 +-
 .../Controllers/IVpnController.cs             |   5 +-
 .../Settings/DynamicAppPathsIpcEntity.cs      |  29 ++
 .../SplitTunneling/ISplitTunnelClient.cs      |   6 +-
 .../SplitTunneling/SplitTunnelClient.cs       |  26 +-
 .../SplitTunnelNetworkFilters.cs              | 107 ++++-
 src/ProtonVPN.Service/VpnController.cs        |  16 +-
 54 files changed, 1609 insertions(+), 38 deletions(-)
 create mode 100644 src/Client/ProtonVPN.Client.Core/Services/SplitTunneling/FolderWatcherService.cs
 create mode 100644 src/Client/ProtonVPN.Client.Core/Services/SplitTunneling/IFolderWatcherService.cs
 create mode 100644 src/Client/ProtonVPN.Client/Handlers/SplitTunnelingFolderOrchestrator.cs
 create mode 100644 src/Client/ProtonVPN.Client/UI/Main/Settings/Pages/Connection/SplitTunnelingFolderViewModel.cs
 create mode 100644 src/Client/Settings/ProtonVPN.Client.Settings.Contracts/Models/SplitTunnelingFolder.cs
 create mode 100644 src/ProcessCommunication/ProtonVPN.ProcessCommunication.Contracts/Entities/Settings/DynamicAppPathsIpcEntity.cs

diff --git a/src/Client/Localization/ProtonVPN.Client.Localization/Strings/ar-SA/Resources.resw b/src/Client/Localization/ProtonVPN.Client.Localization/Strings/ar-SA/Resources.resw
index e91d1c365..ee4012bec 100644
--- a/src/Client/Localization/ProtonVPN.Client.Localization/Strings/ar-SA/Resources.resw
+++ b/src/Client/Localization/ProtonVPN.Client.Localization/Strings/ar-SA/Resources.resw
@@ -3999,6 +3999,15 @@ VPN</value>
     <value>استبعاد</value>
     <comment>Shorter version (if possible) of "Exclude mode". To be used when available space is limited.</comment>
   </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_Header" xml:space="preserve">
+    <value>المجلدات المختارة ({0})</value>
+  </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_Remove" xml:space="preserve">
+    <value>إزالة المجلد</value>
+  </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_NotFound" xml:space="preserve">
+    <value>لم يتم العثور على المجلد</value>
+  </data>
   <data name="Settings_Connection_VpnAccelerator">
     <value>VPN Accelerator</value>
   </data>
diff --git a/src/Client/Localization/ProtonVPN.Client.Localization/Strings/be-BY/Resources.resw b/src/Client/Localization/ProtonVPN.Client.Localization/Strings/be-BY/Resources.resw
index 1b135528c..0d5353ee4 100644
--- a/src/Client/Localization/ProtonVPN.Client.Localization/Strings/be-BY/Resources.resw
+++ b/src/Client/Localization/ProtonVPN.Client.Localization/Strings/be-BY/Resources.resw
@@ -3783,6 +3783,15 @@ Secure Core</value>
     <value>Выключае</value>
     <comment>Shorter version (if possible) of "Exclude mode". To be used when available space is limited.</comment>
   </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_Header" xml:space="preserve">
+    <value>Выбраныя папкі ({0})</value>
+  </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_Remove" xml:space="preserve">
+    <value>Выдаліць папку</value>
+  </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_NotFound" xml:space="preserve">
+    <value>Папка не знойдзеna</value>
+  </data>
   <data name="Settings_Connection_VpnAccelerator">
     <value>VPN Accelerator</value>
   </data>
diff --git a/src/Client/Localization/ProtonVPN.Client.Localization/Strings/ca-ES/Resources.resw b/src/Client/Localization/ProtonVPN.Client.Localization/Strings/ca-ES/Resources.resw
index 3354b93fa..cded2096b 100644
--- a/src/Client/Localization/ProtonVPN.Client.Localization/Strings/ca-ES/Resources.resw
+++ b/src/Client/Localization/ProtonVPN.Client.Localization/Strings/ca-ES/Resources.resw
@@ -3568,6 +3568,15 @@ Una càrrega elevada del servidor pot alentir la vostra connexió.</value>
     <value>Exclou</value>
     <comment>Shorter version (if possible) of "Exclude mode". To be used when available space is limited.</comment>
   </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_Header" xml:space="preserve">
+    <value>Carpetes seleccionades ({0})</value>
+  </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_Remove" xml:space="preserve">
+    <value>Eliminar carpeta</value>
+  </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_NotFound" xml:space="preserve">
+    <value>Carpeta no trobada</value>
+  </data>
   <data name="Settings_Connection_VpnAccelerator">
     <value>VPN Accelerator</value>
   </data>
diff --git a/src/Client/Localization/ProtonVPN.Client.Localization/Strings/cs-CZ/Resources.resw b/src/Client/Localization/ProtonVPN.Client.Localization/Strings/cs-CZ/Resources.resw
index 5ac9bcb2a..c4e22aae0 100644
--- a/src/Client/Localization/ProtonVPN.Client.Localization/Strings/cs-CZ/Resources.resw
+++ b/src/Client/Localization/ProtonVPN.Client.Localization/Strings/cs-CZ/Resources.resw
@@ -3783,6 +3783,15 @@ Vysoké vytížení serveru může zpomalit vaše připojení.</value>
     <value>Vyloučit</value>
     <comment>Shorter version (if possible) of "Exclude mode". To be used when available space is limited.</comment>
   </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_Header" xml:space="preserve">
+    <value>Vybrané složky ({0})</value>
+  </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_Remove" xml:space="preserve">
+    <value>Odebrat složku</value>
+  </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_NotFound" xml:space="preserve">
+    <value>Složka nenalezena</value>
+  </data>
   <data name="Settings_Connection_VpnAccelerator">
     <value>VPN Accelerator</value>
   </data>
diff --git a/src/Client/Localization/ProtonVPN.Client.Localization/Strings/da-DK/Resources.resw b/src/Client/Localization/ProtonVPN.Client.Localization/Strings/da-DK/Resources.resw
index b98547d2a..707338d15 100644
--- a/src/Client/Localization/ProtonVPN.Client.Localization/Strings/da-DK/Resources.resw
+++ b/src/Client/Localization/ProtonVPN.Client.Localization/Strings/da-DK/Resources.resw
@@ -3567,6 +3567,15 @@ En høj serverbelastning kan gøre din forbindelse langsommere.</value>
     <value>Ekskluder</value>
     <comment>Shorter version (if possible) of "Exclude mode". To be used when available space is limited.</comment>
   </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_Header" xml:space="preserve">
+    <value>Valgte mapper ({0})</value>
+  </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_Remove" xml:space="preserve">
+    <value>Fjern mappe</value>
+  </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_NotFound" xml:space="preserve">
+    <value>Mappen blev ikke fundet</value>
+  </data>
   <data name="Settings_Connection_VpnAccelerator">
     <value>VPN Accelerator</value>
   </data>
diff --git a/src/Client/Localization/ProtonVPN.Client.Localization/Strings/de-DE/Resources.resw b/src/Client/Localization/ProtonVPN.Client.Localization/Strings/de-DE/Resources.resw
index 9bf2acd5e..1a8116dad 100644
--- a/src/Client/Localization/ProtonVPN.Client.Localization/Strings/de-DE/Resources.resw
+++ b/src/Client/Localization/ProtonVPN.Client.Localization/Strings/de-DE/Resources.resw
@@ -3567,6 +3567,15 @@ Eine hohe Serverauslastung kann deine Verbindung verlangsamen.</value>
     <value>Ausschließen</value>
     <comment>Shorter version (if possible) of "Exclude mode". To be used when available space is limited.</comment>
   </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_Header" xml:space="preserve">
+    <value>Ausgewählte Ordner ({0})</value>
+  </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_Remove" xml:space="preserve">
+    <value>Ordner entfernen</value>
+  </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_NotFound" xml:space="preserve">
+    <value>Ordner nicht gefunden</value>
+  </data>
   <data name="Settings_Connection_VpnAccelerator">
     <value>VPN Accelerator</value>
   </data>
diff --git a/src/Client/Localization/ProtonVPN.Client.Localization/Strings/el-GR/Resources.resw b/src/Client/Localization/ProtonVPN.Client.Localization/Strings/el-GR/Resources.resw
index 53d1a9e97..fbf45e376 100644
--- a/src/Client/Localization/ProtonVPN.Client.Localization/Strings/el-GR/Resources.resw
+++ b/src/Client/Localization/ProtonVPN.Client.Localization/Strings/el-GR/Resources.resw
@@ -3567,6 +3567,15 @@
     <value>Εξαίρεση</value>
     <comment>Shorter version (if possible) of "Exclude mode". To be used when available space is limited.</comment>
   </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_Header" xml:space="preserve">
+    <value>Επιλεγμένοι φάκελοι ({0})</value>
+  </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_Remove" xml:space="preserve">
+    <value>Κατάργηση φακέλου</value>
+  </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_NotFound" xml:space="preserve">
+    <value>Δεν βρέθηκε ο φάκελος</value>
+  </data>
   <data name="Settings_Connection_VpnAccelerator">
     <value>VPN Accelerator</value>
   </data>
diff --git a/src/Client/Localization/ProtonVPN.Client.Localization/Strings/en-US/Resources.resw b/src/Client/Localization/ProtonVPN.Client.Localization/Strings/en-US/Resources.resw
index 5031eec9a..34c156c43 100644
--- a/src/Client/Localization/ProtonVPN.Client.Localization/Strings/en-US/Resources.resw
+++ b/src/Client/Localization/ProtonVPN.Client.Localization/Strings/en-US/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -2505,6 +2505,16 @@
     <value>App files</value>
     <comment>Describe the name of the filter used to select executable files in the Open file dialog</comment>
   </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_Header" xml:space="preserve">
+    <value>Selected folders ({0})</value>
+    <comment>{0} is a placeholder for the number of selected folders in the list.</comment>
+  </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_Remove" xml:space="preserve">
+    <value>Remove folder</value>
+  </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_NotFound" xml:space="preserve">
+    <value>Folder not found</value>
+  </data>
   <data name="Settings_Connection_Advanced_CustomDnsServers_Conflict_Description" xml:space="preserve">
     <value>You won't be able to use NetShield when connected with a custom DNS server.</value>
   </data>
diff --git a/src/Client/Localization/ProtonVPN.Client.Localization/Strings/es-419/Resources.resw b/src/Client/Localization/ProtonVPN.Client.Localization/Strings/es-419/Resources.resw
index b32df9b41..a5d08d469 100644
--- a/src/Client/Localization/ProtonVPN.Client.Localization/Strings/es-419/Resources.resw
+++ b/src/Client/Localization/ProtonVPN.Client.Localization/Strings/es-419/Resources.resw
@@ -3567,6 +3567,15 @@ Una carga alta del servidor puede ralentizar la conexión.</value>
     <value>Excluir</value>
     <comment>Shorter version (if possible) of "Exclude mode". To be used when available space is limited.</comment>
   </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_Header" xml:space="preserve">
+    <value>Carpetas seleccionadas ({0})</value>
+  </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_Remove" xml:space="preserve">
+    <value>Eliminar carpeta</value>
+  </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_NotFound" xml:space="preserve">
+    <value>Carpeta no encontrada</value>
+  </data>
   <data name="Settings_Connection_VpnAccelerator">
     <value>VPN Accelerator</value>
   </data>
diff --git a/src/Client/Localization/ProtonVPN.Client.Localization/Strings/es-ES/Resources.resw b/src/Client/Localization/ProtonVPN.Client.Localization/Strings/es-ES/Resources.resw
index ee201669a..b3d9c5005 100644
--- a/src/Client/Localization/ProtonVPN.Client.Localization/Strings/es-ES/Resources.resw
+++ b/src/Client/Localization/ProtonVPN.Client.Localization/Strings/es-ES/Resources.resw
@@ -3567,6 +3567,15 @@ Una carga del servidor alta puede ralentizar tu conexión.</value>
     <value>Excluir</value>
     <comment>Shorter version (if possible) of "Exclude mode". To be used when available space is limited.</comment>
   </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_Header" xml:space="preserve">
+    <value>Carpetas seleccionadas ({0})</value>
+  </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_Remove" xml:space="preserve">
+    <value>Eliminar carpeta</value>
+  </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_NotFound" xml:space="preserve">
+    <value>Carpeta no encontrada</value>
+  </data>
   <data name="Settings_Connection_VpnAccelerator">
     <value>VPN Accelerator</value>
   </data>
diff --git a/src/Client/Localization/ProtonVPN.Client.Localization/Strings/fa-IR/Resources.resw b/src/Client/Localization/ProtonVPN.Client.Localization/Strings/fa-IR/Resources.resw
index 64cba5391..286be0786 100644
--- a/src/Client/Localization/ProtonVPN.Client.Localization/Strings/fa-IR/Resources.resw
+++ b/src/Client/Localization/ProtonVPN.Client.Localization/Strings/fa-IR/Resources.resw
@@ -3567,6 +3567,15 @@ Secure Core</value>
     <value>Exclude</value>
     <comment>Shorter version (if possible) of "Exclude mode". To be used when available space is limited.</comment>
   </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_Header" xml:space="preserve">
+    <value>پوشه‌های انتخاب شده ({0})</value>
+  </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_Remove" xml:space="preserve">
+    <value>حذف پوشه</value>
+  </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_NotFound" xml:space="preserve">
+    <value>پوشه پیدا نشد</value>
+  </data>
   <data name="Settings_Connection_VpnAccelerator">
     <value>VPN Accelerator</value>
   </data>
diff --git a/src/Client/Localization/ProtonVPN.Client.Localization/Strings/fi-FI/Resources.resw b/src/Client/Localization/ProtonVPN.Client.Localization/Strings/fi-FI/Resources.resw
index 5cb8421a1..9d7380d0d 100644
--- a/src/Client/Localization/ProtonVPN.Client.Localization/Strings/fi-FI/Resources.resw
+++ b/src/Client/Localization/ProtonVPN.Client.Localization/Strings/fi-FI/Resources.resw
@@ -3567,6 +3567,15 @@ Korkea kuormitus voi hidastaa yhteyttäsi.</value>
     <value>Poissulje</value>
     <comment>Shorter version (if possible) of "Exclude mode". To be used when available space is limited.</comment>
   </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_Header" xml:space="preserve">
+    <value>Valitut kansiot ({0})</value>
+  </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_Remove" xml:space="preserve">
+    <value>Poista kansio</value>
+  </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_NotFound" xml:space="preserve">
+    <value>Kansiota ei löytynyt</value>
+  </data>
   <data name="Settings_Connection_VpnAccelerator">
     <value>VPN Accelerator</value>
   </data>
diff --git a/src/Client/Localization/ProtonVPN.Client.Localization/Strings/fr-FR/Resources.resw b/src/Client/Localization/ProtonVPN.Client.Localization/Strings/fr-FR/Resources.resw
index 32ddae597..b5a5c810a 100644
--- a/src/Client/Localization/ProtonVPN.Client.Localization/Strings/fr-FR/Resources.resw
+++ b/src/Client/Localization/ProtonVPN.Client.Localization/Strings/fr-FR/Resources.resw
@@ -3567,6 +3567,15 @@ Une charge de serveur élevée peut ralentir votre connexion.</value>
     <value>Exclure</value>
     <comment>Shorter version (if possible) of "Exclude mode". To be used when available space is limited.</comment>
   </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_Header" xml:space="preserve">
+    <value>Dossiers sélectionnés ({0})</value>
+  </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_Remove" xml:space="preserve">
+    <value>Supprimer le dossier</value>
+  </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_NotFound" xml:space="preserve">
+    <value>Dossier introuvable</value>
+  </data>
   <data name="Settings_Connection_VpnAccelerator">
     <value>VPN Accelerator</value>
   </data>
diff --git a/src/Client/Localization/ProtonVPN.Client.Localization/Strings/hu-HU/Resources.resw b/src/Client/Localization/ProtonVPN.Client.Localization/Strings/hu-HU/Resources.resw
index d9aad2a38..0699217c2 100644
--- a/src/Client/Localization/ProtonVPN.Client.Localization/Strings/hu-HU/Resources.resw
+++ b/src/Client/Localization/ProtonVPN.Client.Localization/Strings/hu-HU/Resources.resw
@@ -3567,6 +3567,15 @@ A nagy szerverterhelés lelassíthatja a kapcsolatot.</value>
     <value>Kihagy</value>
     <comment>Shorter version (if possible) of "Exclude mode". To be used when available space is limited.</comment>
   </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_Header" xml:space="preserve">
+    <value>Kiválastott mappák ({0})</value>
+  </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_Remove" xml:space="preserve">
+    <value>Mappa eltávolítása</value>
+  </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_NotFound" xml:space="preserve">
+    <value>Mappa nem található</value>
+  </data>
   <data name="Settings_Connection_VpnAccelerator">
     <value>VPN Accelerator</value>
   </data>
diff --git a/src/Client/Localization/ProtonVPN.Client.Localization/Strings/id-ID/Resources.resw b/src/Client/Localization/ProtonVPN.Client.Localization/Strings/id-ID/Resources.resw
index 898236a72..919a34bde 100644
--- a/src/Client/Localization/ProtonVPN.Client.Localization/Strings/id-ID/Resources.resw
+++ b/src/Client/Localization/ProtonVPN.Client.Localization/Strings/id-ID/Resources.resw
@@ -3459,6 +3459,15 @@ Beban server yang tinggi dapat memperlambat koneksi Anda.</value>
     <value>Kecualikan</value>
     <comment>Shorter version (if possible) of "Exclude mode". To be used when available space is limited.</comment>
   </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_Header" xml:space="preserve">
+    <value>Folder terpilih ({0})</value>
+  </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_Remove" xml:space="preserve">
+    <value>Hapus folder</value>
+  </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_NotFound" xml:space="preserve">
+    <value>Folder tidak ditemukan</value>
+  </data>
   <data name="Settings_Connection_VpnAccelerator">
     <value>VPN Accelerator</value>
   </data>
diff --git a/src/Client/Localization/ProtonVPN.Client.Localization/Strings/it-IT/Resources.resw b/src/Client/Localization/ProtonVPN.Client.Localization/Strings/it-IT/Resources.resw
index a8ccc88fb..a033e5fcc 100644
--- a/src/Client/Localization/ProtonVPN.Client.Localization/Strings/it-IT/Resources.resw
+++ b/src/Client/Localization/ProtonVPN.Client.Localization/Strings/it-IT/Resources.resw
@@ -3567,6 +3567,15 @@ Un carico elevato può rallentare la connessione.</value>
     <value>Escludi</value>
     <comment>Shorter version (if possible) of "Exclude mode". To be used when available space is limited.</comment>
   </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_Header" xml:space="preserve">
+    <value>Cartelle selezionate ({0})</value>
+  </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_Remove" xml:space="preserve">
+    <value>Rimuovi cartella</value>
+  </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_NotFound" xml:space="preserve">
+    <value>Cartella non trovata</value>
+  </data>
   <data name="Settings_Connection_VpnAccelerator">
     <value>VPN Accelerator</value>
   </data>
diff --git a/src/Client/Localization/ProtonVPN.Client.Localization/Strings/ja-JP/Resources.resw b/src/Client/Localization/ProtonVPN.Client.Localization/Strings/ja-JP/Resources.resw
index db74b1a37..c1e78829c 100644
--- a/src/Client/Localization/ProtonVPN.Client.Localization/Strings/ja-JP/Resources.resw
+++ b/src/Client/Localization/ProtonVPN.Client.Localization/Strings/ja-JP/Resources.resw
@@ -3459,6 +3459,15 @@ VPN接続</value>
     <value>除外</value>
     <comment>Shorter version (if possible) of "Exclude mode". To be used when available space is limited.</comment>
   </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_Header" xml:space="preserve">
+    <value>選択したフォルダー ({0})</value>
+  </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_Remove" xml:space="preserve">
+    <value>フォルダーを削除</value>
+  </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_NotFound" xml:space="preserve">
+    <value>フォルダーが見つかりません</value>
+  </data>
   <data name="Settings_Connection_VpnAccelerator">
     <value>VPN Accelerator</value>
   </data>
diff --git a/src/Client/Localization/ProtonVPN.Client.Localization/Strings/ka-GE/Resources.resw b/src/Client/Localization/ProtonVPN.Client.Localization/Strings/ka-GE/Resources.resw
index e992f55e4..65e951b66 100644
--- a/src/Client/Localization/ProtonVPN.Client.Localization/Strings/ka-GE/Resources.resw
+++ b/src/Client/Localization/ProtonVPN.Client.Localization/Strings/ka-GE/Resources.resw
@@ -3567,6 +3567,15 @@ VPN მიერთება</value>
     <value>Exclude</value>
     <comment>Shorter version (if possible) of "Exclude mode". To be used when available space is limited.</comment>
   </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_Header" xml:space="preserve">
+    <value>არჩეული საქაღალდეები ({0})</value>
+  </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_Remove" xml:space="preserve">
+    <value>საქაღალდის წაშლა</value>
+  </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_NotFound" xml:space="preserve">
+    <value>საქაღალდე ვერ მოიძებნა</value>
+  </data>
   <data name="Settings_Connection_VpnAccelerator">
     <value>VPN Accelerator</value>
   </data>
diff --git a/src/Client/Localization/ProtonVPN.Client.Localization/Strings/ko-KR/Resources.resw b/src/Client/Localization/ProtonVPN.Client.Localization/Strings/ko-KR/Resources.resw
index 6d47eea5b..35c75fa48 100644
--- a/src/Client/Localization/ProtonVPN.Client.Localization/Strings/ko-KR/Resources.resw
+++ b/src/Client/Localization/ProtonVPN.Client.Localization/Strings/ko-KR/Resources.resw
@@ -3459,6 +3459,15 @@ VPN 연결</value>
     <value>제외</value>
     <comment>Shorter version (if possible) of "Exclude mode". To be used when available space is limited.</comment>
   </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_Header" xml:space="preserve">
+    <value>선택한 폴더 ({0})</value>
+  </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_Remove" xml:space="preserve">
+    <value>폴더 제거</value>
+  </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_NotFound" xml:space="preserve">
+    <value>폴더를 찾을 수 없음</value>
+  </data>
   <data name="Settings_Connection_VpnAccelerator">
     <value>VPN Accelerator</value>
   </data>
diff --git a/src/Client/Localization/ProtonVPN.Client.Localization/Strings/nb-NO/Resources.resw b/src/Client/Localization/ProtonVPN.Client.Localization/Strings/nb-NO/Resources.resw
index 7175427e1..48c296bc1 100644
--- a/src/Client/Localization/ProtonVPN.Client.Localization/Strings/nb-NO/Resources.resw
+++ b/src/Client/Localization/ProtonVPN.Client.Localization/Strings/nb-NO/Resources.resw
@@ -3567,6 +3567,15 @@ En høy tjenerbelastning kan redusere tilkoblingen.</value>
     <value>Ekskluder</value>
     <comment>Shorter version (if possible) of "Exclude mode". To be used when available space is limited.</comment>
   </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_Header" xml:space="preserve">
+    <value>Valgte mapper ({0})</value>
+  </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_Remove" xml:space="preserve">
+    <value>Fjern mappe</value>
+  </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_NotFound" xml:space="preserve">
+    <value>Mappen ble ikke funnet</value>
+  </data>
   <data name="Settings_Connection_VpnAccelerator">
     <value>VPN Accelerator</value>
   </data>
diff --git a/src/Client/Localization/ProtonVPN.Client.Localization/Strings/nl-NL/Resources.resw b/src/Client/Localization/ProtonVPN.Client.Localization/Strings/nl-NL/Resources.resw
index 723336ec9..e7255a8ac 100644
--- a/src/Client/Localization/ProtonVPN.Client.Localization/Strings/nl-NL/Resources.resw
+++ b/src/Client/Localization/ProtonVPN.Client.Localization/Strings/nl-NL/Resources.resw
@@ -3567,6 +3567,15 @@ VPN-verbinding</value>
     <value>Exclusief</value>
     <comment>Shorter version (if possible) of "Exclude mode". To be used when available space is limited.</comment>
   </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_Header" xml:space="preserve">
+    <value>Geselecteerde mappen ({0})</value>
+  </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_Remove" xml:space="preserve">
+    <value>Map verwijderen</value>
+  </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_NotFound" xml:space="preserve">
+    <value>Map niet gevonden</value>
+  </data>
   <data name="Settings_Connection_VpnAccelerator">
     <value>VPN Accelerator</value>
   </data>
diff --git a/src/Client/Localization/ProtonVPN.Client.Localization/Strings/pl-PL/Resources.resw b/src/Client/Localization/ProtonVPN.Client.Localization/Strings/pl-PL/Resources.resw
index 56b8509d1..1c8d38d4f 100644
--- a/src/Client/Localization/ProtonVPN.Client.Localization/Strings/pl-PL/Resources.resw
+++ b/src/Client/Localization/ProtonVPN.Client.Localization/Strings/pl-PL/Resources.resw
@@ -3783,6 +3783,15 @@ Duże obciążenie serwera może spowolnić połączenie.</value>
     <value>Wyklucz</value>
     <comment>Shorter version (if possible) of "Exclude mode". To be used when available space is limited.</comment>
   </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_Header" xml:space="preserve">
+    <value>Wybrane foldery ({0})</value>
+  </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_Remove" xml:space="preserve">
+    <value>Usuń folder</value>
+  </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_NotFound" xml:space="preserve">
+    <value>Folder nie został znaleziony</value>
+  </data>
   <data name="Settings_Connection_VpnAccelerator">
     <value>VPN Accelerator</value>
   </data>
diff --git a/src/Client/Localization/ProtonVPN.Client.Localization/Strings/pt-BR/Resources.resw b/src/Client/Localization/ProtonVPN.Client.Localization/Strings/pt-BR/Resources.resw
index 9c4844f0a..11fc85095 100644
--- a/src/Client/Localization/ProtonVPN.Client.Localization/Strings/pt-BR/Resources.resw
+++ b/src/Client/Localization/ProtonVPN.Client.Localization/Strings/pt-BR/Resources.resw
@@ -3567,6 +3567,15 @@ Uma carga alta de servidor pode tornar sua conexão mais lenta.</value>
     <value>Excluir</value>
     <comment>Shorter version (if possible) of "Exclude mode". To be used when available space is limited.</comment>
   </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_Header" xml:space="preserve">
+    <value>Pastas selecionadas ({0})</value>
+  </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_Remove" xml:space="preserve">
+    <value>Remover pasta</value>
+  </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_NotFound" xml:space="preserve">
+    <value>Pasta não encontrada</value>
+  </data>
   <data name="Settings_Connection_VpnAccelerator">
     <value>VPN Accelerator</value>
   </data>
diff --git a/src/Client/Localization/ProtonVPN.Client.Localization/Strings/pt-PT/Resources.resw b/src/Client/Localization/ProtonVPN.Client.Localization/Strings/pt-PT/Resources.resw
index 453e72a06..abeaaf04b 100644
--- a/src/Client/Localization/ProtonVPN.Client.Localization/Strings/pt-PT/Resources.resw
+++ b/src/Client/Localization/ProtonVPN.Client.Localization/Strings/pt-PT/Resources.resw
@@ -3567,6 +3567,15 @@ Uma carga elevada do servidor pode diminuir a sua conexão.</value>
     <value>Excluir</value>
     <comment>Shorter version (if possible) of "Exclude mode". To be used when available space is limited.</comment>
   </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_Header" xml:space="preserve">
+    <value>Pastas selecionadas ({0})</value>
+  </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_Remove" xml:space="preserve">
+    <value>Remover pasta</value>
+  </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_NotFound" xml:space="preserve">
+    <value>Pasta não encontrada</value>
+  </data>
   <data name="Settings_Connection_VpnAccelerator">
     <value>VPN Accelerator</value>
   </data>
diff --git a/src/Client/Localization/ProtonVPN.Client.Localization/Strings/ro-RO/Resources.resw b/src/Client/Localization/ProtonVPN.Client.Localization/Strings/ro-RO/Resources.resw
index c8751a2f0..b263479e5 100644
--- a/src/Client/Localization/ProtonVPN.Client.Localization/Strings/ro-RO/Resources.resw
+++ b/src/Client/Localization/ProtonVPN.Client.Localization/Strings/ro-RO/Resources.resw
@@ -3675,6 +3675,15 @@ O solicitare mare a serverului vă poate încetini conexiunea.</value>
     <value>Excludere</value>
     <comment>Shorter version (if possible) of "Exclude mode". To be used when available space is limited.</comment>
   </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_Header" xml:space="preserve">
+    <value>Dosare selectate ({0})</value>
+  </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_Remove" xml:space="preserve">
+    <value>Eliminați dosarul</value>
+  </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_NotFound" xml:space="preserve">
+    <value>Dosarul nu a fost găsit</value>
+  </data>
   <data name="Settings_Connection_VpnAccelerator">
     <value>VPN Accelerator</value>
   </data>
diff --git a/src/Client/Localization/ProtonVPN.Client.Localization/Strings/ru-RU/Resources.resw b/src/Client/Localization/ProtonVPN.Client.Localization/Strings/ru-RU/Resources.resw
index e4dcdf546..5d4ccf84f 100644
--- a/src/Client/Localization/ProtonVPN.Client.Localization/Strings/ru-RU/Resources.resw
+++ b/src/Client/Localization/ProtonVPN.Client.Localization/Strings/ru-RU/Resources.resw
@@ -3783,6 +3783,15 @@ Error code: {0}</value>
     <value>Exclude</value>
     <comment>Shorter version (if possible) of "Exclude mode". To be used when available space is limited.</comment>
   </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_Header" xml:space="preserve">
+    <value>Выбранные папки ({0})</value>
+  </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_Remove" xml:space="preserve">
+    <value>Удалить папку</value>
+  </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_NotFound" xml:space="preserve">
+    <value>Папка не найдена</value>
+  </data>
   <data name="Settings_Connection_VpnAccelerator">
     <value>VPN Accelerator</value>
   </data>
diff --git a/src/Client/Localization/ProtonVPN.Client.Localization/Strings/sk-SK/Resources.resw b/src/Client/Localization/ProtonVPN.Client.Localization/Strings/sk-SK/Resources.resw
index 34101122a..a986b563c 100644
--- a/src/Client/Localization/ProtonVPN.Client.Localization/Strings/sk-SK/Resources.resw
+++ b/src/Client/Localization/ProtonVPN.Client.Localization/Strings/sk-SK/Resources.resw
@@ -3783,6 +3783,15 @@ Vysoké vyťaženie servera môže spomaliť vaše pripojenie.</value>
     <value>Vylúčiť</value>
     <comment>Shorter version (if possible) of "Exclude mode". To be used when available space is limited.</comment>
   </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_Header" xml:space="preserve">
+    <value>Vybrané priečinky ({0})</value>
+  </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_Remove" xml:space="preserve">
+    <value>Odstrániť priečinok</value>
+  </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_NotFound" xml:space="preserve">
+    <value>Priečinok sa nenašiel</value>
+  </data>
   <data name="Settings_Connection_VpnAccelerator">
     <value>VPN Accelerator</value>
   </data>
diff --git a/src/Client/Localization/ProtonVPN.Client.Localization/Strings/sl-SI/Resources.resw b/src/Client/Localization/ProtonVPN.Client.Localization/Strings/sl-SI/Resources.resw
index b692d00ba..29885cf3b 100644
--- a/src/Client/Localization/ProtonVPN.Client.Localization/Strings/sl-SI/Resources.resw
+++ b/src/Client/Localization/ProtonVPN.Client.Localization/Strings/sl-SI/Resources.resw
@@ -3783,6 +3783,15 @@ Velika obremenitev strežnika lahko upočasni vašo povezavo.</value>
     <value>Exclude</value>
     <comment>Shorter version (if possible) of "Exclude mode". To be used when available space is limited.</comment>
   </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_Header" xml:space="preserve">
+    <value>Izbrane mape ({0})</value>
+  </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_Remove" xml:space="preserve">
+    <value>Odstrani mapo</value>
+  </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_NotFound" xml:space="preserve">
+    <value>Mapa ni bila najdena</value>
+  </data>
   <data name="Settings_Connection_VpnAccelerator">
     <value>VPN Accelerator</value>
   </data>
diff --git a/src/Client/Localization/ProtonVPN.Client.Localization/Strings/sv-SE/Resources.resw b/src/Client/Localization/ProtonVPN.Client.Localization/Strings/sv-SE/Resources.resw
index fbad03b33..b21dd226e 100644
--- a/src/Client/Localization/ProtonVPN.Client.Localization/Strings/sv-SE/Resources.resw
+++ b/src/Client/Localization/ProtonVPN.Client.Localization/Strings/sv-SE/Resources.resw
@@ -3567,6 +3567,15 @@ En hög serverbelastning kan sakta ner din anslutning.</value>
     <value>Exkludera</value>
     <comment>Shorter version (if possible) of "Exclude mode". To be used when available space is limited.</comment>
   </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_Header" xml:space="preserve">
+    <value>Valda mappar ({0})</value>
+  </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_Remove" xml:space="preserve">
+    <value>Ta bort mapp</value>
+  </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_NotFound" xml:space="preserve">
+    <value>Mappen hittades inte</value>
+  </data>
   <data name="Settings_Connection_VpnAccelerator">
     <value>VPN Accelerator</value>
   </data>
diff --git a/src/Client/Localization/ProtonVPN.Client.Localization/Strings/tr-TR/Resources.resw b/src/Client/Localization/ProtonVPN.Client.Localization/Strings/tr-TR/Resources.resw
index f239942e5..3951a334f 100644
--- a/src/Client/Localization/ProtonVPN.Client.Localization/Strings/tr-TR/Resources.resw
+++ b/src/Client/Localization/ProtonVPN.Client.Localization/Strings/tr-TR/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -3567,6 +3567,15 @@ Yükü yüksek olan sunucular bağlantınızı yavaşlatabilir.</value>
     <value>Katma</value>
     <comment>Shorter version (if possible) of "Exclude mode". To be used when available space is limited.</comment>
   </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_Header" xml:space="preserve">
+    <value>Seçilmiş klasörler ({0})</value>
+  </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_Remove" xml:space="preserve">
+    <value>Klasörü kaldır</value>
+  </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_NotFound" xml:space="preserve">
+    <value>Klasör bulunamadı</value>
+  </data>
   <data name="Settings_Connection_VpnAccelerator">
     <value>VPN Accelerator</value>
   </data>
diff --git a/src/Client/Localization/ProtonVPN.Client.Localization/Strings/uk-UA/Resources.resw b/src/Client/Localization/ProtonVPN.Client.Localization/Strings/uk-UA/Resources.resw
index 10bfc9321..c8c639786 100644
--- a/src/Client/Localization/ProtonVPN.Client.Localization/Strings/uk-UA/Resources.resw
+++ b/src/Client/Localization/ProtonVPN.Client.Localization/Strings/uk-UA/Resources.resw
@@ -3783,6 +3783,15 @@ VPN-з'єднання</value>
     <value>Винятки</value>
     <comment>Shorter version (if possible) of "Exclude mode". To be used when available space is limited.</comment>
   </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_Header" xml:space="preserve">
+    <value>Вибрані папки ({0})</value>
+  </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_Remove" xml:space="preserve">
+    <value>Видалити папку</value>
+  </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_NotFound" xml:space="preserve">
+    <value>Папка не знайдена</value>
+  </data>
   <data name="Settings_Connection_VpnAccelerator">
     <value>VPN Accelerator</value>
   </data>
diff --git a/src/Client/Localization/ProtonVPN.Client.Localization/Strings/zh-CN/Resources.resw b/src/Client/Localization/ProtonVPN.Client.Localization/Strings/zh-CN/Resources.resw
index 7835df525..389ab2a4f 100644
--- a/src/Client/Localization/ProtonVPN.Client.Localization/Strings/zh-CN/Resources.resw
+++ b/src/Client/Localization/ProtonVPN.Client.Localization/Strings/zh-CN/Resources.resw
@@ -3459,6 +3459,15 @@ VPN 连接</value>
     <value>排除</value>
     <comment>Shorter version (if possible) of "Exclude mode". To be used when available space is limited.</comment>
   </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_Header" xml:space="preserve">
+    <value>已选文件夹 ({0})</value>
+  </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_Remove" xml:space="preserve">
+    <value>移除文件夹</value>
+  </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_NotFound" xml:space="preserve">
+    <value>文件夹未找到</value>
+  </data>
   <data name="Settings_Connection_VpnAccelerator">
     <value>VPN Accelerator</value>
   </data>
diff --git a/src/Client/Localization/ProtonVPN.Client.Localization/Strings/zh-TW/Resources.resw b/src/Client/Localization/ProtonVPN.Client.Localization/Strings/zh-TW/Resources.resw
index d4f8bfe81..1e9d4720d 100644
--- a/src/Client/Localization/ProtonVPN.Client.Localization/Strings/zh-TW/Resources.resw
+++ b/src/Client/Localization/ProtonVPN.Client.Localization/Strings/zh-TW/Resources.resw
@@ -3460,6 +3460,15 @@ VPN 連線</value>
     <value>排除</value>
     <comment>Shorter version (if possible) of "Exclude mode". To be used when available space is limited.</comment>
   </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_Header" xml:space="preserve">
+    <value>已選取資料夾 ({0})</value>
+  </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_Remove" xml:space="preserve">
+    <value>移除資料夾</value>
+  </data>
+  <data name="Settings_Connection_SplitTunneling_Folders_NotFound" xml:space="preserve">
+    <value>找不到資料夾</value>
+  </data>
   <data name="Settings_Connection_VpnAccelerator">
     <value>VPN Accelerator</value>
   </data>
diff --git a/src/Client/Logic/Connection/ProtonVPN.Client.Logic.Connection/RequestCreators/MainSettingsRequestCreator.cs b/src/Client/Logic/Connection/ProtonVPN.Client.Logic.Connection/RequestCreators/MainSettingsRequestCreator.cs
index bd6c1212b..992805595 100644
--- a/src/Client/Logic/Connection/ProtonVPN.Client.Logic.Connection/RequestCreators/MainSettingsRequestCreator.cs
+++ b/src/Client/Logic/Connection/ProtonVPN.Client.Logic.Connection/RequestCreators/MainSettingsRequestCreator.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) 2025 Proton AG
  *
  * This file is part of ProtonVPN.
@@ -76,7 +76,7 @@ private MainSettingsIpcEntity Create()
                 Mode = _settings.IsSplitTunnelingEnabled
                     ? _entityMapper.Map<SplitTunnelingMode, SplitTunnelModeIpcEntity>(_settings.SplitTunnelingMode)
                     : SplitTunnelModeIpcEntity.Disabled,
-                AppPaths = GetSplitTunnelingApps(),
+                AppPaths = GetAllSplitTunnelExecutables(),
                 Ips = GetSplitTunnelingIpAddresses()
             },
             ModerateNat = _settings.NatType == NatType.Moderate,
@@ -97,16 +97,51 @@ private MainSettingsIpcEntity Create()
         };
     }
 
+    private string[] GetAllSplitTunnelExecutables()
+    {
+        string[] appPaths = GetSplitTunnelingApps();
+        string[] folderExePaths = GetSplitTunnelingFolders();
+
+        return appPaths.Concat(folderExePaths).Distinct(StringComparer.OrdinalIgnoreCase).ToArray();
+    }
+
     private string[] GetSplitTunnelingApps()
     {
-        return _settings.SplitTunnelingMode == SplitTunnelingMode.Standard
-            ? GetSplitTunnelingApps(_settings.SplitTunnelingStandardAppsList)
-            : GetSplitTunnelingApps(_settings.SplitTunnelingInverseAppsList);
+        var apps = _settings.SplitTunnelingMode == SplitTunnelingMode.Standard
+            ? _settings.SplitTunnelingStandardAppsList
+            : _settings.SplitTunnelingInverseAppsList;
+
+        if (apps == null) return [];
+
+        return apps.Where(app => app.IsActive).SelectMany(app => app.GetAllAppFilePaths()).ToArray();
     }
 
-    private string[] GetSplitTunnelingApps(List<SplitTunnelingApp> settingsApps)
+    private string[] GetSplitTunnelingFolders()
     {
-        return settingsApps.Where(app => app.IsActive).SelectMany(app => app.GetAllAppFilePaths()).ToArray();
+        var folders = _settings.SplitTunnelingMode == SplitTunnelingMode.Standard
+            ? _settings.SplitTunnelingStandardFoldersList
+            : _settings.SplitTunnelingInverseFoldersList;
+
+        if (folders == null) return [];
+
+        List<string> allExePaths = [];
+
+        foreach (SplitTunnelingFolder folder in folders.Where(f => f.IsActive))
+        {
+            try
+            {
+                if (Directory.Exists(folder.FolderPath))
+                {
+                    string[] exeFiles = Directory.GetFiles(folder.FolderPath, "*.exe", SearchOption.AllDirectories);
+                    allExePaths.AddRange(exeFiles);
+                }
+            }
+            catch
+            {
+            }
+        }
+
+        return allExePaths.ToArray();
     }
 
     private string[] GetSplitTunnelingIpAddresses()
diff --git a/src/Client/Logic/Services/ProtonVPN.Client.Logic.Services.Contracts/IVpnServiceCaller.cs b/src/Client/Logic/Services/ProtonVPN.Client.Logic.Services.Contracts/IVpnServiceCaller.cs
index 861c1a1ac..94d9f8550 100644
--- a/src/Client/Logic/Services/ProtonVPN.Client.Logic.Services.Contracts/IVpnServiceCaller.cs
+++ b/src/Client/Logic/Services/ProtonVPN.Client.Logic.Services.Contracts/IVpnServiceCaller.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) 2026 Proton AG
  *
  * This file is part of ProtonVPN.
@@ -39,4 +39,7 @@ public interface IVpnServiceCaller
 
     Task RepeatStateAsync();
     Task RepeatPortForwardingStateAsync();
+
+    Task AddAppPathsDynamicallyAsync(DynamicAppPathsIpcEntity appPathsEntity);
+    Task RemoveAppPathsDynamicallyAsync(DynamicAppPathsIpcEntity appPathsEntity);
 }
\ No newline at end of file
diff --git a/src/Client/Logic/Services/ProtonVPN.Client.Logic.Services/VpnServiceCaller.cs b/src/Client/Logic/Services/ProtonVPN.Client.Logic.Services/VpnServiceCaller.cs
index defbbb863..6fef4ae33 100644
--- a/src/Client/Logic/Services/ProtonVPN.Client.Logic.Services/VpnServiceCaller.cs
+++ b/src/Client/Logic/Services/ProtonVPN.Client.Logic.Services/VpnServiceCaller.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) 2023 Proton AG
  *
  * This file is part of ProtonVPN.
@@ -81,4 +81,14 @@ public Task RepeatPortForwardingStateAsync()
     {
         return InvokeAsync((c, ct) => c.RepeatPortForwardingState(ct).Wrap());
     }
+
+    public Task AddAppPathsDynamicallyAsync(DynamicAppPathsIpcEntity appPathsEntity)
+    {
+        return InvokeAsync((c, ct) => c.AddAppPathsDynamically(appPathsEntity, ct).Wrap());
+    }
+
+    public Task RemoveAppPathsDynamicallyAsync(DynamicAppPathsIpcEntity appPathsEntity)
+    {
+        return InvokeAsync((c, ct) => c.RemoveAppPathsDynamically(appPathsEntity, ct).Wrap());
+    }
 }
\ No newline at end of file
diff --git a/src/Client/ProtonVPN.Client.Core/Extensions/WindowExtensions.cs b/src/Client/ProtonVPN.Client.Core/Extensions/WindowExtensions.cs
index a76a0b0e3..e93003ffe 100644
--- a/src/Client/ProtonVPN.Client.Core/Extensions/WindowExtensions.cs
+++ b/src/Client/ProtonVPN.Client.Core/Extensions/WindowExtensions.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) 2025 Proton AG
  *
  * This file is part of ProtonVPN.
@@ -312,6 +312,23 @@ public static async Task<string> PickSingleFileAsync(this Window window, string
         }
     }
 
+    public static async Task<string> PickSingleFolderAsync(this Window window)
+    {
+        try
+        {
+            FolderPicker picker = new();
+            WinRT.Interop.InitializeWithWindow.Initialize(picker, WinRT.Interop.WindowNative.GetWindowHandle(window));
+            picker.FileTypeFilter.Add("*");
+
+            StorageFolder folder = await picker.PickSingleFolderAsync();
+            return folder?.Path ?? string.Empty;
+        }
+        catch (Exception)
+        {
+            return string.Empty;
+        }
+    }
+
     public static double GetTitleBarOpacity(this Window window)
     {
         return window is IFocusAware focusAware && focusAware.IsFocused()
diff --git a/src/Client/ProtonVPN.Client.Core/Services/SplitTunneling/FolderWatcherService.cs b/src/Client/ProtonVPN.Client.Core/Services/SplitTunneling/FolderWatcherService.cs
new file mode 100644
index 000000000..e57b459a2
--- /dev/null
+++ b/src/Client/ProtonVPN.Client.Core/Services/SplitTunneling/FolderWatcherService.cs
@@ -0,0 +1,376 @@
+/*
+ * Copyright (c) 2026 Proton AG
+ *
+ * This file is part of ProtonVPN.
+ *
+ * ProtonVPN is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * ProtonVPN is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with ProtonVPN.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Threading;
+using ProtonVPN.Logging.Contracts;
+using ProtonVPN.Logging.Contracts.Events.SplitTunnelLogs;
+
+namespace ProtonVPN.Client.Core.Services.SplitTunneling;
+
+public class FolderWatcherService : IFolderWatcherService
+{
+    private readonly ILogger _logger;
+    private readonly Dictionary<string, FileSystemWatcher> _watchers;
+    private readonly Dictionary<string, Timer> _debounceTimers;
+    private readonly Dictionary<string, List<Action>> _pendingActions;
+    private readonly object _lock = new();
+
+    private const int DEBOUNCE_DELAY_MS = 500;
+    private const int MAX_WATCHED_FOLDERS = 50;
+
+    public event EventHandler<FolderChangedEventArgs>? FolderChanged;
+
+    public FolderWatcherService(ILogger logger)
+    {
+        _logger = logger;
+        _watchers = new(StringComparer.OrdinalIgnoreCase);
+        _debounceTimers = new(StringComparer.OrdinalIgnoreCase);
+        _pendingActions = new(StringComparer.OrdinalIgnoreCase);
+    }
+
+    public void StartWatching(string folderPath)
+    {
+        lock (_lock)
+        {
+            if (_watchers.Count >= MAX_WATCHED_FOLDERS)
+            {
+                _logger.Warn<SplitTunnelLog>(
+                    $"Maximum watched folders limit reached: {MAX_WATCHED_FOLDERS}");
+                return;
+            }
+
+            if (_watchers.ContainsKey(folderPath))
+            {
+                return;
+            }
+
+            if (!Directory.Exists(folderPath))
+            {
+                _logger.Warn<SplitTunnelLog>(
+                    $"Cannot watch non-existent folder: {folderPath}");
+                return;
+            }
+
+            try
+            {
+                FileSystemWatcher watcher = new(folderPath)
+                {
+                    IncludeSubdirectories = true,
+                    NotifyFilter = NotifyFilters.FileName | NotifyFilters.DirectoryName
+                };
+
+                watcher.Created += OnFileCreated;
+                watcher.Deleted += OnFileDeleted;
+                watcher.Renamed += OnFileRenamed;
+                watcher.Error += OnWatcherError;
+
+                watcher.EnableRaisingEvents = true;
+                _watchers[folderPath] = watcher;
+
+                _logger.Info<SplitTunnelLog>(
+                    $"Started watching folder: {folderPath}");
+            }
+            catch (Exception ex)
+            {
+                _logger.Error<SplitTunnelLog>(
+                    $"Failed to start watching folder: {folderPath}", ex);
+            }
+        }
+    }
+
+    public void StopWatching(string folderPath)
+    {
+        lock (_lock)
+        {
+            if (_watchers.TryGetValue(folderPath, out FileSystemWatcher? watcher))
+            {
+                DisposeWatcher(watcher);
+                _watchers.Remove(folderPath);
+
+                if (_debounceTimers.TryGetValue(folderPath, out Timer? timer))
+                {
+                    timer.Dispose();
+                    _debounceTimers.Remove(folderPath);
+                }
+
+                _pendingActions.Remove(folderPath);
+
+                _logger.Info<SplitTunnelLog>(
+                    $"Stopped watching folder: {folderPath}");
+            }
+        }
+    }
+
+    public void StopAllWatching()
+    {
+        lock (_lock)
+        {
+            foreach (FileSystemWatcher watcher in _watchers.Values)
+            {
+                DisposeWatcher(watcher);
+            }
+
+            _watchers.Clear();
+
+            foreach (Timer timer in _debounceTimers.Values)
+            {
+                timer.Dispose();
+            }
+
+            _debounceTimers.Clear();
+            _pendingActions.Clear();
+
+            _logger.Info<SplitTunnelLog>("Stopped watching all folders");
+        }
+    }
+
+    public IReadOnlyList<string> ScanForExecutables(string folderPath)
+    {
+        try
+        {
+            if (!Directory.Exists(folderPath))
+            {
+                return Array.Empty<string>();
+            }
+
+            return Directory.GetFiles(folderPath, "*.exe", SearchOption.AllDirectories);
+        }
+        catch (UnauthorizedAccessException ex)
+        {
+            _logger.Warn<SplitTunnelLog>(
+                $"Access denied scanning folder: {folderPath}", ex);
+            return Array.Empty<string>();
+        }
+        catch (Exception ex)
+        {
+            _logger.Error<SplitTunnelLog>(
+                $"Error scanning folder: {folderPath}", ex);
+            return Array.Empty<string>();
+        }
+    }
+
+    private void OnFileCreated(object sender, FileSystemEventArgs e)
+    {
+        string? folderPath = GetWatchedFolderPath(e.FullPath);
+        if (folderPath == null) return;
+
+        try
+        {
+            if (Directory.Exists(e.FullPath))
+            {
+                EnqueueDebouncedAction(folderPath, () =>
+                {
+                    try
+                    {
+                        string[] files = Directory.GetFiles(e.FullPath, "*.exe", SearchOption.AllDirectories);
+                        foreach (string file in files)
+                        {
+                            FolderChanged?.Invoke(this, new FolderChangedEventArgs(
+                                folderPath, FolderChangeType.ExecutableAdded, file));
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        _logger.Error<SplitTunnelLog>($"Error scanning directory {e.FullPath}", ex);
+                    }
+                });
+            }
+            else if (e.FullPath.EndsWith(".exe", StringComparison.OrdinalIgnoreCase))
+            {
+                EnqueueDebouncedAction(folderPath, () =>
+                {
+                    FolderChanged?.Invoke(this, new FolderChangedEventArgs(
+                        folderPath, FolderChangeType.ExecutableAdded, e.FullPath));
+                });
+            }
+        }
+        catch (Exception ex)
+        {
+            _logger.Error<SplitTunnelLog>($"Error processing FileCreated for {e.FullPath}", ex);
+        }
+    }
+
+    private void OnFileDeleted(object sender, FileSystemEventArgs e)
+    {
+        string? folderPath = GetWatchedFolderPath(e.FullPath);
+        if (folderPath == null) return;
+
+        if (e.FullPath.EndsWith(".exe", StringComparison.OrdinalIgnoreCase))
+        {
+            EnqueueDebouncedAction(folderPath, () =>
+            {
+                FolderChanged?.Invoke(this, new FolderChangedEventArgs(
+                    folderPath, FolderChangeType.ExecutableRemoved, e.FullPath));
+            });
+        }
+    }
+
+    private void OnFileRenamed(object sender, RenamedEventArgs e)
+    {
+        string? folderPath = GetWatchedFolderPath(e.FullPath);
+        if (folderPath == null)
+        {
+            return;
+        }
+
+        bool oldIsExe = e.OldFullPath.EndsWith(".exe", StringComparison.OrdinalIgnoreCase);
+        bool newIsExe = e.FullPath.EndsWith(".exe", StringComparison.OrdinalIgnoreCase);
+
+        if (oldIsExe && newIsExe)
+        {
+            EnqueueDebouncedAction(folderPath, () =>
+            {
+                FolderChanged?.Invoke(this, new FolderChangedEventArgs(
+                    folderPath, FolderChangeType.ExecutableRenamed,
+                    e.FullPath, e.OldFullPath));
+            });
+        }
+        else if (!oldIsExe && newIsExe)
+        {
+            EnqueueDebouncedAction(folderPath, () =>
+            {
+                FolderChanged?.Invoke(this, new FolderChangedEventArgs(
+                    folderPath, FolderChangeType.ExecutableAdded, e.FullPath));
+            });
+        }
+        else if (oldIsExe && !newIsExe)
+        {
+            EnqueueDebouncedAction(folderPath, () =>
+            {
+                FolderChanged?.Invoke(this, new FolderChangedEventArgs(
+                    folderPath, FolderChangeType.ExecutableRemoved, e.OldFullPath));
+            });
+        }
+    }
+
+    private void OnWatcherError(object sender, ErrorEventArgs e)
+    {
+        _logger.Error<SplitTunnelLog>(
+            "FileSystemWatcher error", e.GetException());
+
+        if (sender is FileSystemWatcher watcher)
+        {
+            string folderPath = watcher.Path;
+            try
+            {
+                watcher.EnableRaisingEvents = false;
+                if (Directory.Exists(folderPath))
+                {
+                    watcher.EnableRaisingEvents = true;
+                    _logger.Info<SplitTunnelLog>(
+                        $"Successfully restarted watcher for: {folderPath}");
+                }
+                else
+                {
+                    FolderChanged?.Invoke(this, new FolderChangedEventArgs(
+                        folderPath, FolderChangeType.FolderDeleted));
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.Error<SplitTunnelLog>(
+                    $"Failed to restart watcher for: {folderPath}", ex);
+                FolderChanged?.Invoke(this, new FolderChangedEventArgs(
+                    folderPath, FolderChangeType.FolderDeleted));
+            }
+        }
+    }
+
+    private void EnqueueDebouncedAction(string folderPath, Action action)
+    {
+        lock (_lock)
+        {
+            if (!_pendingActions.ContainsKey(folderPath))
+            {
+                _pendingActions[folderPath] = new();
+            }
+
+            _pendingActions[folderPath].Add(action);
+
+
+            if (_debounceTimers.TryGetValue(folderPath, out Timer? existingTimer))
+            {
+                existingTimer.Dispose();
+            }
+
+            Timer timer = new(_ =>
+            {
+                List<Action>? actions;
+                lock (_lock)
+                {
+                    _pendingActions.TryGetValue(folderPath, out actions);
+                    _pendingActions.Remove(folderPath);
+                    _debounceTimers.Remove(folderPath);
+                }
+
+                if (actions != null)
+                {
+                    foreach (Action a in actions)
+                    {
+                        try
+                        {
+                            a();
+                        }
+                        catch (Exception ex)
+                        {
+                            _logger.Error<SplitTunnelLog>(
+                                "Error processing folder change", ex);
+                        }
+                    }
+                }
+            }, null, DEBOUNCE_DELAY_MS, Timeout.Infinite);
+
+            _debounceTimers[folderPath] = timer;
+        }
+    }
+
+    private string? GetWatchedFolderPath(string filePath)
+    {
+        lock (_lock)
+        {
+            foreach (string watchedPath in _watchers.Keys)
+            {
+                if (filePath.StartsWith(watchedPath, StringComparison.OrdinalIgnoreCase))
+                {
+                    return watchedPath;
+                }
+            }
+        }
+
+        return null;
+    }
+
+    private void DisposeWatcher(FileSystemWatcher watcher)
+    {
+        watcher.EnableRaisingEvents = false;
+        watcher.Created -= OnFileCreated;
+        watcher.Deleted -= OnFileDeleted;
+        watcher.Renamed -= OnFileRenamed;
+        watcher.Error -= OnWatcherError;
+        watcher.Dispose();
+    }
+
+    public void Dispose()
+    {
+        StopAllWatching();
+    }
+}
diff --git a/src/Client/ProtonVPN.Client.Core/Services/SplitTunneling/IFolderWatcherService.cs b/src/Client/ProtonVPN.Client.Core/Services/SplitTunneling/IFolderWatcherService.cs
new file mode 100644
index 000000000..8816c8a44
--- /dev/null
+++ b/src/Client/ProtonVPN.Client.Core/Services/SplitTunneling/IFolderWatcherService.cs
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2026 Proton AG
+ *
+ * This file is part of ProtonVPN.
+ *
+ * ProtonVPN is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * ProtonVPN is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with ProtonVPN.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+using System;
+using System.Collections.Generic;
+
+namespace ProtonVPN.Client.Core.Services.SplitTunneling;
+
+public interface IFolderWatcherService : IDisposable
+{
+    event EventHandler<FolderChangedEventArgs>? FolderChanged;
+
+    void StartWatching(string folderPath);
+
+    void StopWatching(string folderPath);
+
+    void StopAllWatching();
+
+    IReadOnlyList<string> ScanForExecutables(string folderPath);
+}
+
+public class FolderChangedEventArgs : EventArgs
+{
+    public string FolderPath { get; }
+    public FolderChangeType ChangeType { get; }
+    public string? AffectedFilePath { get; }
+    public string? OldFilePath { get; }
+
+    public FolderChangedEventArgs(
+        string folderPath,
+        FolderChangeType changeType,
+        string? affectedFilePath = null,
+        string? oldFilePath = null)
+    {
+        FolderPath = folderPath;
+        ChangeType = changeType;
+        AffectedFilePath = affectedFilePath;
+        OldFilePath = oldFilePath;
+    }
+}
+
+public enum FolderChangeType
+{
+    ExecutableAdded,
+    ExecutableRemoved,
+    ExecutableRenamed,
+    FolderDeleted
+}
diff --git a/src/Client/ProtonVPN.Client/Handlers/SplitTunnelingFolderOrchestrator.cs b/src/Client/ProtonVPN.Client/Handlers/SplitTunnelingFolderOrchestrator.cs
new file mode 100644
index 000000000..9d3e6c0d3
--- /dev/null
+++ b/src/Client/ProtonVPN.Client/Handlers/SplitTunnelingFolderOrchestrator.cs
@@ -0,0 +1,214 @@
+/*
+ * Copyright (c) 2026 Proton AG
+ *
+ * This file is part of ProtonVPN.
+ *
+ * ProtonVPN is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * ProtonVPN is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with ProtonVPN.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using ProtonVPN.Client.Core.Services.SplitTunneling;
+using ProtonVPN.Client.EventMessaging.Contracts;
+using ProtonVPN.Client.Logic.Services.Contracts;
+using ProtonVPN.Client.Settings.Contracts;
+using ProtonVPN.Client.Settings.Contracts.Messages;
+using ProtonVPN.ProcessCommunication.Contracts.Entities.Settings;
+using ProtonVPN.ProcessCommunication.Contracts.Entities.Vpn;
+
+using ProtonVPN.Client.Handlers.Bases;
+
+namespace ProtonVPN.Client.Handlers;
+
+public class SplitTunnelingFolderOrchestrator :
+    IHandler,
+    IEventMessageReceiver<VpnStateIpcEntity>,
+    IEventMessageReceiver<SettingChangedMessage>,
+    IDisposable
+{
+    private readonly IFolderWatcherService _folderWatcherService;
+    private readonly IVpnServiceCaller _vpnServiceCaller;
+    private readonly ISettings _settings;
+
+    private bool _isVpnConnected;
+    private bool _disposed;
+    private HashSet<string> _previousActivePaths = new(StringComparer.OrdinalIgnoreCase);
+
+    public SplitTunnelingFolderOrchestrator(
+        IFolderWatcherService folderWatcherService,
+        IVpnServiceCaller vpnServiceCaller,
+        ISettings settings)
+    {
+        _folderWatcherService = folderWatcherService;
+        _vpnServiceCaller = vpnServiceCaller;
+        _settings = settings;
+
+        _folderWatcherService.FolderChanged += OnFolderChanged;
+    }
+
+    public void Receive(VpnStateIpcEntity message)
+    {
+        bool wasConnected = _isVpnConnected;
+        _isVpnConnected = message.Status == VpnStatusIpcEntity.Connected;
+
+        if (_isVpnConnected && !wasConnected)
+        {
+            _previousActivePaths = GetCurrentActivePaths();
+            UpdateWatchedFolders();
+        }
+        else if (!_isVpnConnected && wasConnected)
+        {
+            _folderWatcherService.StopAllWatching();
+            _previousActivePaths.Clear();
+        }
+    }
+
+    public void Receive(SettingChangedMessage message)
+    {
+        if (message.PropertyName == nameof(ISettings.SplitTunnelingStandardFoldersList) ||
+            message.PropertyName == nameof(ISettings.SplitTunnelingInverseFoldersList) ||
+            message.PropertyName == nameof(ISettings.SplitTunnelingMode) ||
+            message.PropertyName == nameof(ISettings.IsSplitTunnelingEnabled))
+        {
+            OnFolderSettingsChanged();
+        }
+    }
+
+    private async void OnFolderSettingsChanged()
+    {
+        UpdateWatchedFolders();
+
+        if (!_isVpnConnected) return;
+
+        HashSet<string> newActivePaths = GetCurrentActivePaths();
+
+        string[] removedPaths = _previousActivePaths.Except(newActivePaths, StringComparer.OrdinalIgnoreCase).ToArray();
+        string[] addedPaths = newActivePaths.Except(_previousActivePaths, StringComparer.OrdinalIgnoreCase).ToArray();
+
+        if (removedPaths.Length > 0)
+        {
+            await _vpnServiceCaller.RemoveAppPathsDynamicallyAsync(
+                new DynamicAppPathsIpcEntity { AppPaths = removedPaths });
+        }
+
+        if (addedPaths.Length > 0)
+        {
+            await _vpnServiceCaller.AddAppPathsDynamicallyAsync(
+                new DynamicAppPathsIpcEntity { AppPaths = addedPaths });
+        }
+
+        _previousActivePaths = newActivePaths;
+    }
+
+    private HashSet<string> GetCurrentActivePaths()
+    {
+        HashSet<string> paths = new(StringComparer.OrdinalIgnoreCase);
+
+        if (!_settings.IsSplitTunnelingEnabled) return paths;
+
+        var folders = _settings.SplitTunnelingMode == Settings.Contracts.Enums.SplitTunnelingMode.Standard
+            ? _settings.SplitTunnelingStandardFoldersList
+            : _settings.SplitTunnelingInverseFoldersList;
+
+        if (folders == null) return paths;
+
+        foreach (var folder in folders.Where(f => f.IsActive))
+        {
+            try
+            {
+                if (Directory.Exists(folder.FolderPath))
+                {
+                    foreach (string exe in Directory.GetFiles(folder.FolderPath, "*.exe", SearchOption.AllDirectories))
+                    {
+                        paths.Add(exe);
+                    }
+                }
+            }
+            catch
+            {
+            }
+        }
+
+        return paths;
+    }
+
+    private void UpdateWatchedFolders()
+    {
+        _folderWatcherService.StopAllWatching();
+
+        if (!_settings.IsSplitTunnelingEnabled)
+        {
+            return;
+        }
+
+        var folders = _settings.SplitTunnelingMode == Settings.Contracts.Enums.SplitTunnelingMode.Standard
+            ? _settings.SplitTunnelingStandardFoldersList
+            : _settings.SplitTunnelingInverseFoldersList;
+
+        if (folders == null) return;
+
+        foreach (var folder in folders.Where(f => f.IsActive))
+        {
+            _folderWatcherService.StartWatching(folder.FolderPath);
+        }
+    }
+
+    private async void OnFolderChanged(object? sender, FolderChangedEventArgs e)
+    {
+        if (!_isVpnConnected || !_settings.IsSplitTunnelingEnabled)
+        {
+            return;
+        }
+
+        if (e.AffectedFilePath == null) return;
+
+        var entity = new DynamicAppPathsIpcEntity
+        {
+            AppPaths = [e.AffectedFilePath]
+        };
+
+        if (e.ChangeType == FolderChangeType.ExecutableAdded)
+        {
+            _previousActivePaths.Add(e.AffectedFilePath);
+            await _vpnServiceCaller.AddAppPathsDynamicallyAsync(entity);
+        }
+        else if (e.ChangeType == FolderChangeType.ExecutableRemoved)
+        {
+            _previousActivePaths.Remove(e.AffectedFilePath);
+            await _vpnServiceCaller.RemoveAppPathsDynamicallyAsync(entity);
+        }
+        else if (e.ChangeType == FolderChangeType.ExecutableRenamed)
+        {
+            if (!string.IsNullOrEmpty(e.OldFilePath))
+            {
+                _previousActivePaths.Remove(e.OldFilePath);
+                await _vpnServiceCaller.RemoveAppPathsDynamicallyAsync(new DynamicAppPathsIpcEntity { AppPaths = [e.OldFilePath] });
+            }
+            _previousActivePaths.Add(e.AffectedFilePath);
+            await _vpnServiceCaller.AddAppPathsDynamicallyAsync(entity);
+        }
+    }
+
+    public void Dispose()
+    {
+        if (_disposed) return;
+        _folderWatcherService.FolderChanged -= OnFolderChanged;
+        _folderWatcherService.StopAllWatching();
+        _previousActivePaths.Clear();
+        _disposed = true;
+    }
+}
diff --git a/src/Client/ProtonVPN.Client/Installers/AppModule.cs b/src/Client/ProtonVPN.Client/Installers/AppModule.cs
index eec512aca..401dd83f7 100644
--- a/src/Client/ProtonVPN.Client/Installers/AppModule.cs
+++ b/src/Client/ProtonVPN.Client/Installers/AppModule.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) 2025 Proton AG
  *
  * This file is part of ProtonVPN.
@@ -26,6 +26,7 @@
 using ProtonVPN.Client.EventMessaging.Installers;
 using ProtonVPN.Client.Factories;
 using ProtonVPN.Client.Files.Installers;
+using ProtonVPN.Client.Core.Services.SplitTunneling;
 using ProtonVPN.Client.Handlers;
 using ProtonVPN.Client.Handlers.Bases;
 using ProtonVPN.Client.Localization.Installers;
@@ -228,6 +229,7 @@ private void RegisterLocalServices(ContainerBuilder builder)
         builder.RegisterType<AppStartupActivator>().AsImplementedInterfaces().SingleInstance().AutoActivate();
         builder.RegisterType<PageViewMapper>().AsImplementedInterfaces().SingleInstance();
         builder.RegisterType<OverlayViewMapper>().AsImplementedInterfaces().SingleInstance();
+        builder.RegisterType<FolderWatcherService>().AsImplementedInterfaces().SingleInstance();
         builder.RegisterType<UIThreadDispatcher>().AsImplementedInterfaces().SingleInstance();
         builder.RegisterType<HumanVerifier>().AsImplementedInterfaces().SingleInstance();
         builder.RegisterType<HumanVerificationConfig>().AsImplementedInterfaces().SingleInstance();
diff --git a/src/Client/ProtonVPN.Client/UI/Main/Settings/Pages/Connection/SplitTunnelingFolderViewModel.cs b/src/Client/ProtonVPN.Client/UI/Main/Settings/Pages/Connection/SplitTunnelingFolderViewModel.cs
new file mode 100644
index 000000000..62a61fd4e
--- /dev/null
+++ b/src/Client/ProtonVPN.Client/UI/Main/Settings/Pages/Connection/SplitTunnelingFolderViewModel.cs
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2026 Proton AG
+ *
+ * This file is part of ProtonVPN.
+ *
+ * ProtonVPN is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * ProtonVPN is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with ProtonVPN.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using ProtonVPN.Client.Core.Bases;
+using ProtonVPN.Client.Core.Bases.ViewModels;
+using ProtonVPN.Client.Core.Services.SplitTunneling;
+
+namespace ProtonVPN.Client.UI.Main.Settings.Connection;
+
+public partial class SplitTunnelingFolderViewModel : ViewModelBase
+{
+    private readonly SplitTunnelingPageViewModel _parentViewModel;
+
+    [ObservableProperty]
+    private bool _isActive;
+
+    [ObservableProperty]
+    private bool _isValidPath;
+
+    public string FolderPath { get; }
+
+    public string FolderName { get; private set; }
+
+    [ObservableProperty]
+    private int _executableCount;
+
+    public SplitTunnelingFolderViewModel(
+        IViewModelHelper viewModelHelper,
+        SplitTunnelingPageViewModel parentViewModel,
+        string folderPath,
+        bool isActive)
+        : base(viewModelHelper)
+    {
+        _parentViewModel = parentViewModel;
+        FolderPath = folderPath;
+        _isActive = isActive;
+
+        IsValidPath = Directory.Exists(FolderPath);
+        FolderName = Path.GetFileName(FolderPath);
+        if (string.IsNullOrEmpty(FolderName))
+        {
+            FolderName = FolderPath; // Root drives or UNC
+        }
+    }
+
+    [RelayCommand]
+    public void RemoveFolder()
+    {
+        _parentViewModel.RemoveFolder(this);
+    }
+
+    public void UpdateExecutableCount(int count)
+    {
+        ExecutableCount = count;
+    }
+
+    partial void OnIsActiveChanged(bool value)
+    {
+        _parentViewModel.InvalidateFoldersCount();
+    }
+}
diff --git a/src/Client/ProtonVPN.Client/UI/Main/Settings/Pages/Connection/SplitTunnelingPageView.xaml b/src/Client/ProtonVPN.Client/UI/Main/Settings/Pages/Connection/SplitTunnelingPageView.xaml
index 0b5496659..79de626ef 100644
--- a/src/Client/ProtonVPN.Client/UI/Main/Settings/Pages/Connection/SplitTunnelingPageView.xaml
+++ b/src/Client/ProtonVPN.Client/UI/Main/Settings/Pages/Connection/SplitTunnelingPageView.xaml
@@ -253,6 +253,153 @@ along with ProtonVPN.  If not, see <https://www.gnu.org/licenses/>.
                 </controls:SettingsCard>
             </StackPanel>
 
+            <StackPanel Spacing="8"
+                        Visibility="{x:Bind ViewModel.IsSplitTunnelingEnabled}">
+
+                <TextBlock Foreground="{ThemeResource TextWeakColorBrush}"
+                           Style="{StaticResource CaptionTextBlockStyle}"
+                           Text="{x:Bind ViewModel.Localizer.GetFormat('Settings_Connection_SplitTunneling_Folders_Header', ViewModel.ActiveFoldersCount)}" />
+
+                <controls:SettingsCard IsTabStop="False"
+                                       Style="{StaticResource VerticalSettingsCardStyle}">
+                    <Grid Margin="0,-8,0,0">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="*" />
+                            <RowDefinition Height="Auto" />
+                        </Grid.RowDefinitions>
+
+                        <ItemsRepeater Grid.Row="0"
+                                       Margin="0,0,0,16"
+                                       ItemsSource="{x:Bind ViewModel.StandardFolders}"
+                                       Visibility="{x:Bind ViewModel.HasStandardFolders, Mode=OneWay, Converter={StaticResource BooleanToVisibilityConverter}}">
+                            <ItemsRepeater.Layout>
+                                <StackLayout Spacing="8" />
+                            </ItemsRepeater.Layout>
+                            <ItemsRepeater.ItemTemplate>
+                                <DataTemplate x:DataType="connection:SplitTunnelingFolderViewModel">
+                                    <Grid ColumnSpacing="8">
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition Width="*" />
+                                            <ColumnDefinition Width="Auto" />
+                                        </Grid.ColumnDefinitions>
+                                        <Border Grid.Column="0"
+                                                Background="Transparent"
+                                                ToolTipService.ToolTip="{x:Bind FolderPath}">
+                                            <CheckBox IsChecked="{x:Bind IsActive, Mode=TwoWay}"
+                                                      IsEnabled="{x:Bind IsValidPath}">
+                                                <Grid ColumnSpacing="8">
+                                                    <Grid.ColumnDefinitions>
+                                                        <ColumnDefinition Width="Auto" />
+                                                        <ColumnDefinition Width="*" />
+                                                    </Grid.ColumnDefinitions>
+                                                    <pathicons:Folder Grid.Column="0"
+                                                                       Foreground="{ThemeResource TextNormColorBrush}"
+                                                                       Opacity="0.8"
+                                                                       Size="Pixels20"
+                                                                       Visibility="{x:Bind IsValidPath, Converter={StaticResource BooleanToVisibilityConverter}}" />
+                                                    <TextBlock Grid.Column="1"
+                                                               Text="{x:Bind FolderPath}"
+                                                               TextTrimming="CharacterEllipsis"
+                                                               Visibility="{x:Bind IsValidPath, Converter={StaticResource BooleanToVisibilityConverter}}" />
+                                                    <pathicons:ExclamationCircleFilled Grid.Column="0"
+                                                                                       Foreground="{ThemeResource SignalDangerColorBrush}"
+                                                                                       Opacity="0.6"
+                                                                                       Size="Pixels20"
+                                                                                       Visibility="{x:Bind IsValidPath, Converter={StaticResource NotBooleanToVisibilityConverter}}" />
+                                                    <TextBlock Grid.Column="1"
+                                                               Foreground="{ThemeResource SignalDangerColorBrush}"
+                                                               Opacity="0.6"
+                                                               Text="{x:Bind Localizer.Get('Settings_Connection_SplitTunneling_Folders_NotFound')}"
+                                                               TextTrimming="CharacterEllipsis"
+                                                               Visibility="{x:Bind IsValidPath, Converter={StaticResource NotBooleanToVisibilityConverter}}" />
+                                                </Grid>
+                                            </CheckBox>
+                                        </Border>
+                                        <custom:GhostButton Grid.Column="1"
+                                                            AutomationProperties.AutomationId="RemoveFolderButton"
+                                                            AutomationProperties.Name="{x:Bind Localizer.Get('Settings_Connection_SplitTunneling_Folders_Remove')}"
+                                                            Command="{x:Bind RemoveFolderCommand, Mode=OneTime}"
+                                                            ToolTipService.ToolTip="{x:Bind Localizer.Get('Settings_Connection_SplitTunneling_Folders_Remove')}">
+                                            <custom:GhostButton.LeftIcon>
+                                                <pathicons:Trash />
+                                            </custom:GhostButton.LeftIcon>
+                                        </custom:GhostButton>
+                                    </Grid>
+                                </DataTemplate>
+                            </ItemsRepeater.ItemTemplate>
+                        </ItemsRepeater>
+
+                        <ItemsRepeater Grid.Row="0"
+                                       Margin="0,0,0,16"
+                                       ItemsSource="{x:Bind ViewModel.InverseFolders}"
+                                       Visibility="{x:Bind ViewModel.HasInverseFolders, Mode=OneWay, Converter={StaticResource BooleanToVisibilityConverter}}">
+                            <ItemsRepeater.Layout>
+                                <StackLayout Spacing="8" />
+                            </ItemsRepeater.Layout>
+                            <ItemsRepeater.ItemTemplate>
+                                <DataTemplate x:DataType="connection:SplitTunnelingFolderViewModel">
+                                    <Grid ColumnSpacing="8">
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition Width="*" />
+                                            <ColumnDefinition Width="Auto" />
+                                        </Grid.ColumnDefinitions>
+                                        <Border Grid.Column="0"
+                                                Background="Transparent"
+                                                ToolTipService.ToolTip="{x:Bind FolderPath}">
+                                            <CheckBox IsChecked="{x:Bind IsActive, Mode=TwoWay}"
+                                                      IsEnabled="{x:Bind IsValidPath}">
+                                                <Grid ColumnSpacing="8">
+                                                    <Grid.ColumnDefinitions>
+                                                        <ColumnDefinition Width="Auto" />
+                                                        <ColumnDefinition Width="*" />
+                                                    </Grid.ColumnDefinitions>
+                                                    <pathicons:Folder Grid.Column="0"
+                                                                       Foreground="{ThemeResource TextNormColorBrush}"
+                                                                       Opacity="0.8"
+                                                                       Size="Pixels20"
+                                                                       Visibility="{x:Bind IsValidPath, Converter={StaticResource BooleanToVisibilityConverter}}" />
+                                                    <TextBlock Grid.Column="1"
+                                                               Text="{x:Bind FolderPath}"
+                                                               TextTrimming="CharacterEllipsis"
+                                                               Visibility="{x:Bind IsValidPath, Converter={StaticResource BooleanToVisibilityConverter}}" />
+                                                    <pathicons:ExclamationCircleFilled Grid.Column="0"
+                                                                                       Foreground="{ThemeResource SignalDangerColorBrush}"
+                                                                                       Opacity="0.6"
+                                                                                       Size="Pixels20"
+                                                                                       Visibility="{x:Bind IsValidPath, Converter={StaticResource NotBooleanToVisibilityConverter}}" />
+                                                    <TextBlock Grid.Column="1"
+                                                               Foreground="{ThemeResource SignalDangerColorBrush}"
+                                                               Opacity="0.6"
+                                                               Text="{x:Bind Localizer.Get('Settings_Connection_SplitTunneling_Folders_NotFound')}"
+                                                               TextTrimming="CharacterEllipsis"
+                                                               Visibility="{x:Bind IsValidPath, Converter={StaticResource NotBooleanToVisibilityConverter}}" />
+                                                </Grid>
+                                            </CheckBox>
+                                        </Border>
+                                        <custom:GhostButton Grid.Column="1"
+                                                            AutomationProperties.AutomationId="RemoveFolderButton"
+                                                            AutomationProperties.Name="{x:Bind Localizer.Get('Settings_Connection_SplitTunneling_Folders_Remove')}"
+                                                            Command="{x:Bind RemoveFolderCommand, Mode=OneTime}"
+                                                            ToolTipService.ToolTip="{x:Bind Localizer.Get('Settings_Connection_SplitTunneling_Folders_Remove')}">
+                                            <custom:GhostButton.LeftIcon>
+                                                <pathicons:Trash />
+                                            </custom:GhostButton.LeftIcon>
+                                        </custom:GhostButton>
+                                    </Grid>
+                                </DataTemplate>
+                            </ItemsRepeater.ItemTemplate>
+                        </ItemsRepeater>
+
+                        <Button Grid.Row="1"
+                                HorizontalAlignment="Left"
+                                AutomationProperties.AutomationId="AddFolderButton"
+                                Command="{x:Bind ViewModel.AddFolderCommand, Mode=OneTime}"
+                                Content="{x:Bind ViewModel.Localizer.Get('Common_Actions_Add')}"
+                                IsEnabled="{x:Bind ViewModel.CanAddFolder, Mode=OneWay}" />
+                    </Grid>
+                </controls:SettingsCard>
+            </StackPanel>
+
             <StackPanel Spacing="8"
                         Visibility="{x:Bind ViewModel.IsSplitTunnelingEnabled}">
 
diff --git a/src/Client/ProtonVPN.Client/UI/Main/Settings/Pages/Connection/SplitTunnelingPageViewModel.cs b/src/Client/ProtonVPN.Client/UI/Main/Settings/Pages/Connection/SplitTunnelingPageViewModel.cs
index 1cbac218b..4b860acec 100644
--- a/src/Client/ProtonVPN.Client/UI/Main/Settings/Pages/Connection/SplitTunnelingPageViewModel.cs
+++ b/src/Client/ProtonVPN.Client/UI/Main/Settings/Pages/Connection/SplitTunnelingPageViewModel.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) 2024 Proton AG
  *
  * This file is part of ProtonVPN.
@@ -47,6 +47,7 @@ public partial class SplitTunnelingPageViewModel : SettingsPageViewModelBase
     public override string Title => Localizer.Get("Settings_Connection_SplitTunneling");
 
     private const string EXE_FILE_EXTENSION = ".exe";
+    private const int MAX_FOLDERS = 50;
 
     private readonly IUrlsBrowser _urlsBrowser;
     private readonly IMainWindowActivator _mainWindowActivator;
@@ -68,6 +69,9 @@ public partial class SplitTunnelingPageViewModel : SettingsPageViewModelBase
     [NotifyPropertyChangedFor(nameof(HasStandardApps))]
     [NotifyPropertyChangedFor(nameof(HasInverseApps))]
     [NotifyPropertyChangedFor(nameof(ActiveAppsCount))]
+    [NotifyPropertyChangedFor(nameof(HasStandardFolders))]
+    [NotifyPropertyChangedFor(nameof(HasInverseFolders))]
+    [NotifyPropertyChangedFor(nameof(ActiveFoldersCount))]
     [NotifyPropertyChangedFor(nameof(HasStandardIpAddresses))]
     [NotifyPropertyChangedFor(nameof(HasInverseIpAddresses))]
     [NotifyPropertyChangedFor(nameof(ActiveIpAddressesCount))]
@@ -105,6 +109,21 @@ public bool IsInverseSplitTunneling
                                       ? StandardApps.Count(a => a.IsActive)
                                       : InverseApps.Count(a => a.IsActive);
 
+    [property: SettingName(nameof(ISettings.SplitTunnelingStandardFoldersList))]
+    public ObservableCollection<SplitTunnelingFolderViewModel> StandardFolders { get; }
+
+    [property: SettingName(nameof(ISettings.SplitTunnelingInverseFoldersList))]
+    public ObservableCollection<SplitTunnelingFolderViewModel> InverseFolders { get; }
+
+    public bool HasStandardFolders => CurrentSplitTunnelingMode == SplitTunnelingMode.Standard && StandardFolders.Any();
+    public bool HasInverseFolders => CurrentSplitTunnelingMode == SplitTunnelingMode.Inverse && InverseFolders.Any();
+
+    public int ActiveFoldersCount => CurrentSplitTunnelingMode == SplitTunnelingMode.Standard
+                                      ? StandardFolders.Count(a => a.IsActive)
+                                      : InverseFolders.Count(a => a.IsActive);
+
+    public bool CanAddFolder => StandardFolders.Count + InverseFolders.Count < MAX_FOLDERS;
+
     [property: SettingName(nameof(ISettings.SplitTunnelingStandardIpAddressesList))]
     public ObservableCollection<SplitTunnelingIpAddressViewModel> StandardIpAddresses { get; }
 
@@ -147,6 +166,12 @@ public SplitTunnelingPageViewModel(
         InverseApps = new();
         InverseApps.CollectionChanged += OnAppsCollectionChanged;
 
+        StandardFolders = new();
+        StandardFolders.CollectionChanged += OnFoldersCollectionChanged;
+
+        InverseFolders = new();
+        InverseFolders.CollectionChanged += OnFoldersCollectionChanged;
+
         StandardIpAddresses = new();
         StandardIpAddresses.CollectionChanged += OnIpAddressesCollectionChanged;
 
@@ -156,8 +181,10 @@ public SplitTunnelingPageViewModel(
         PageSettings =
         [
             ChangedSettingArgs.Create(() => Settings.SplitTunnelingStandardAppsList, () => GetSplitTunnelingAppsList(StandardApps)),
+            ChangedSettingArgs.Create(() => Settings.SplitTunnelingStandardFoldersList, () => GetSplitTunnelingFoldersList(StandardFolders)),
             ChangedSettingArgs.Create(() => Settings.SplitTunnelingStandardIpAddressesList, () => GetSplitTunnelingIpAddressesList(StandardIpAddresses)),
             ChangedSettingArgs.Create(() => Settings.SplitTunnelingInverseAppsList, () => GetSplitTunnelingAppsList(InverseApps)),
+            ChangedSettingArgs.Create(() => Settings.SplitTunnelingInverseFoldersList, () => GetSplitTunnelingFoldersList(InverseFolders)),
             ChangedSettingArgs.Create(() => Settings.SplitTunnelingInverseIpAddressesList, () => GetSplitTunnelingIpAddressesList(InverseIpAddresses)),
             ChangedSettingArgs.Create(() => Settings.SplitTunnelingMode, () => CurrentSplitTunnelingMode),
             ChangedSettingArgs.Create(() => Settings.IsSplitTunnelingEnabled, () => IsSplitTunnelingEnabled)
@@ -218,6 +245,44 @@ private ObservableCollection<SplitTunnelingAppViewModel> GetApps()
         return CurrentSplitTunnelingMode == SplitTunnelingMode.Standard ? StandardApps : InverseApps;
     }
 
+    [RelayCommand]
+    public async Task AddFolderAsync()
+    {
+        if (_mainWindowActivator.Window == null)
+        {
+            return;
+        }
+
+        int totalFolders = StandardFolders.Count + InverseFolders.Count;
+        if (totalFolders >= MAX_FOLDERS)
+        {
+            return;
+        }
+
+        ObservableCollection<SplitTunnelingFolderViewModel> folders = GetFolders();
+        string? folderPath = await _mainWindowActivator.Window.PickSingleFolderAsync();
+        
+        if (string.IsNullOrEmpty(folderPath) || !Directory.Exists(folderPath))
+        {
+            return;
+        }
+
+        SplitTunnelingFolderViewModel? folder = folders.FirstOrDefault(f => string.Equals(f.FolderPath, folderPath, StringComparison.OrdinalIgnoreCase));
+        if (folder != null)
+        {
+            folder.IsActive = true;
+        }
+        else
+        {
+            folders.Add(new SplitTunnelingFolderViewModel(ViewModelHelper, this, folderPath, true));
+        }
+    }
+
+    private ObservableCollection<SplitTunnelingFolderViewModel> GetFolders()
+    {
+        return CurrentSplitTunnelingMode == SplitTunnelingMode.Standard ? StandardFolders : InverseFolders;
+    }
+
     [RelayCommand]
     public async Task AddIpAddressAsync()
     {
@@ -324,6 +389,22 @@ private List<SplitTunnelingApp> GetSplitTunnelingAppsList(ObservableCollection<S
         return apps.Select(app => new SplitTunnelingApp(app.AppFilePath, app.IsActive)).ToList();
     }
 
+    public void RemoveFolder(SplitTunnelingFolderViewModel folder)
+    {
+        ObservableCollection<SplitTunnelingFolderViewModel> folders = GetFolders();
+        folders.Remove(folder);
+    }
+
+    public void InvalidateFoldersCount()
+    {
+        OnPropertyChanged(nameof(ActiveFoldersCount));
+    }
+
+    private List<SplitTunnelingFolder> GetSplitTunnelingFoldersList(ObservableCollection<SplitTunnelingFolderViewModel> folders)
+    {
+        return folders.Select(folder => new SplitTunnelingFolder(folder.FolderPath, folder.IsActive)).ToList();
+    }
+
     private List<SplitTunnelingIpAddress> GetSplitTunnelingIpAddressesList(ObservableCollection<SplitTunnelingIpAddressViewModel> ipAddresses)
     {
         return ipAddresses.Select(ip => new SplitTunnelingIpAddress(ip.IpAddress, ip.IsActive)).ToList();
@@ -337,6 +418,9 @@ protected override async Task OnRetrieveSettingsAsync()
         await SetAppsAsync(StandardApps, Settings.SplitTunnelingStandardAppsList);
         await SetAppsAsync(InverseApps, Settings.SplitTunnelingInverseAppsList);
 
+        SetFolders(StandardFolders, Settings.SplitTunnelingStandardFoldersList);
+        SetFolders(InverseFolders, Settings.SplitTunnelingInverseFoldersList);
+
         SetIpAddresses(StandardIpAddresses, Settings.SplitTunnelingStandardIpAddressesList);
         SetIpAddresses(InverseIpAddresses, Settings.SplitTunnelingInverseIpAddressesList);
     }
@@ -350,6 +434,15 @@ private async Task SetAppsAsync(ObservableCollection<SplitTunnelingAppViewModel>
         }
     }
 
+    private void SetFolders(ObservableCollection<SplitTunnelingFolderViewModel> folders, List<SplitTunnelingFolder> settingsFolders)
+    {
+        folders.Clear();
+        foreach (SplitTunnelingFolder folder in settingsFolders)
+        {
+            folders.Add(new SplitTunnelingFolderViewModel(ViewModelHelper, this, folder.FolderPath, folder.IsActive));
+        }
+    }
+
     private void SetIpAddresses(ObservableCollection<SplitTunnelingIpAddressViewModel> ipAddresses, List<SplitTunnelingIpAddress> settingsIpAddresses)
     {
         ipAddresses.Clear();
@@ -406,6 +499,14 @@ private void OnAppsCollectionChanged(object? sender, NotifyCollectionChangedEven
         InvalidateAppsCount();
     }
 
+    private void OnFoldersCollectionChanged(object? sender, NotifyCollectionChangedEventArgs e)
+    {
+        OnPropertyChanged(nameof(HasStandardFolders));
+        OnPropertyChanged(nameof(HasInverseFolders));
+        OnPropertyChanged(nameof(CanAddFolder));
+        InvalidateFoldersCount();
+    }
+
     private void OnIpAddressesCollectionChanged(object? sender, NotifyCollectionChangedEventArgs e)
     {
         OnPropertyChanged(nameof(HasStandardIpAddresses));
@@ -434,16 +535,16 @@ protected override bool IsReconnectionRequiredDueToChanges(IEnumerable<ChangedSe
                 Settings.IsSplitTunnelingEnabled &&
                 Settings.SplitTunnelingMode switch
                 {
-                    SplitTunnelingMode.Standard => Settings.SplitTunnelingStandardAppsList.Any(s => s.IsActive) || Settings.SplitTunnelingStandardIpAddressesList.Any(s => s.IsActive),
-                    SplitTunnelingMode.Inverse => Settings.SplitTunnelingInverseAppsList.Any(s => s.IsActive) || Settings.SplitTunnelingInverseIpAddressesList.Any(s => s.IsActive),
+                    SplitTunnelingMode.Standard => Settings.SplitTunnelingStandardAppsList.Any(s => s.IsActive) || Settings.SplitTunnelingStandardFoldersList.Any(s => s.IsActive) || Settings.SplitTunnelingStandardIpAddressesList.Any(s => s.IsActive),
+                    SplitTunnelingMode.Inverse => Settings.SplitTunnelingInverseAppsList.Any(s => s.IsActive) || Settings.SplitTunnelingInverseFoldersList.Any(s => s.IsActive) || Settings.SplitTunnelingInverseIpAddressesList.Any(s => s.IsActive),
                     _ => false
                 };
             bool hasAnyActiveAppsOrIps =
                 IsSplitTunnelingEnabled &&
                 CurrentSplitTunnelingMode switch
                 {
-                    SplitTunnelingMode.Standard => StandardApps.Any(s => s.IsActive) || StandardIpAddresses.Any(s => s.IsActive),
-                    SplitTunnelingMode.Inverse => InverseApps.Any(s => s.IsActive) || InverseIpAddresses.Any(s => s.IsActive),
+                    SplitTunnelingMode.Standard => StandardApps.Any(s => s.IsActive) || StandardFolders.Any(s => s.IsActive) || StandardIpAddresses.Any(s => s.IsActive),
+                    SplitTunnelingMode.Inverse => InverseApps.Any(s => s.IsActive) || InverseFolders.Any(s => s.IsActive) || InverseIpAddresses.Any(s => s.IsActive),
                     _ => false
                 };
             if (isSameSplitTunnelingMode && !hadAnyActiveAppsOrIps && !hasAnyActiveAppsOrIps)
diff --git a/src/Client/Settings/ProtonVPN.Client.Settings.Contracts/DefaultSettings.cs b/src/Client/Settings/ProtonVPN.Client.Settings.Contracts/DefaultSettings.cs
index bd2865d94..ad20f3f94 100644
--- a/src/Client/Settings/ProtonVPN.Client.Settings.Contracts/DefaultSettings.cs
+++ b/src/Client/Settings/ProtonVPN.Client.Settings.Contracts/DefaultSettings.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) 2025 Proton AG
  *
  * This file is part of ProtonVPN.
@@ -66,6 +66,7 @@ public static class DefaultSettings
     public static bool IsSmartReconnectEnabled = true;
     public static SplitTunnelingMode SplitTunnelingMode = SplitTunnelingMode.Standard;
     public static List<SplitTunnelingIpAddress> SplitTunnelingIpAddressesList = [];
+    public static List<SplitTunnelingFolder> SplitTunnelingFoldersList = [];
     public static List<string> Ipv6Fragments = [];
     public static bool IsIpv6LeakProtectionEnabled = true;
     public static bool IsIpv6Enabled = false;
diff --git a/src/Client/Settings/ProtonVPN.Client.Settings.Contracts/IUserSettings.cs b/src/Client/Settings/ProtonVPN.Client.Settings.Contracts/IUserSettings.cs
index 606632165..57097e166 100644
--- a/src/Client/Settings/ProtonVPN.Client.Settings.Contracts/IUserSettings.cs
+++ b/src/Client/Settings/ProtonVPN.Client.Settings.Contracts/IUserSettings.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) 2025 Proton AG
  *
  * This file is part of ProtonVPN.
@@ -71,6 +71,8 @@ public interface IUserSettings
     List<SplitTunnelingApp> SplitTunnelingInverseAppsList { get; set; }
     List<SplitTunnelingIpAddress> SplitTunnelingStandardIpAddressesList { get; set; }
     List<SplitTunnelingIpAddress> SplitTunnelingInverseIpAddressesList { get; set; }
+    List<SplitTunnelingFolder> SplitTunnelingStandardFoldersList { get; set; }
+    List<SplitTunnelingFolder> SplitTunnelingInverseFoldersList { get; set; }
     List<string> Ipv6Fragments { get; set; }
     string? LastLogicalsStatusId { get; set; }
     ChangeServerAttempts ChangeServerAttempts { get; set; }
diff --git a/src/Client/Settings/ProtonVPN.Client.Settings.Contracts/Models/SplitTunnelingFolder.cs b/src/Client/Settings/ProtonVPN.Client.Settings.Contracts/Models/SplitTunnelingFolder.cs
new file mode 100644
index 000000000..e84c84c3a
--- /dev/null
+++ b/src/Client/Settings/ProtonVPN.Client.Settings.Contracts/Models/SplitTunnelingFolder.cs
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2026 Proton AG
+ *
+ * This file is part of ProtonVPN.
+ *
+ * ProtonVPN is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * ProtonVPN is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with ProtonVPN.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+using System.Diagnostics.CodeAnalysis;
+
+namespace ProtonVPN.Client.Settings.Contracts.Models;
+
+public struct SplitTunnelingFolder : IEquatable<SplitTunnelingFolder>
+{
+    public string FolderPath { get; set; }
+
+    public bool IsActive { get; set; }
+
+    public SplitTunnelingFolder(string folderPath, bool isActive)
+    {
+        FolderPath = folderPath;
+        IsActive = isActive;
+    }
+
+    public bool Equals(SplitTunnelingFolder other)
+    {
+        return string.Equals(FolderPath, other.FolderPath, StringComparison.OrdinalIgnoreCase)
+            && IsActive == other.IsActive;
+    }
+
+    public override bool Equals([NotNullWhen(true)] object? obj)
+    {
+        if (obj?.GetType() != GetType())
+        {
+            return false;
+        }
+        return Equals((SplitTunnelingFolder)obj);
+    }
+
+    public override int GetHashCode()
+    {
+        return HashCode.Combine(FolderPath?.ToUpperInvariant(), IsActive);
+    }
+}
diff --git a/src/Client/Settings/ProtonVPN.Client.Settings/UserSettings.cs b/src/Client/Settings/ProtonVPN.Client.Settings/UserSettings.cs
index 03389dd39..1228feaf5 100644
--- a/src/Client/Settings/ProtonVPN.Client.Settings/UserSettings.cs
+++ b/src/Client/Settings/ProtonVPN.Client.Settings/UserSettings.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) 2025 Proton AG
  *
  * This file is part of ProtonVPN.
@@ -359,6 +359,18 @@ public List<SplitTunnelingIpAddress> SplitTunnelingInverseIpAddressesList
         set => _userCache.SetListValueType<SplitTunnelingIpAddress>(value, SettingEncryption.Unencrypted);
     }
 
+    public List<SplitTunnelingFolder> SplitTunnelingStandardFoldersList
+    {
+        get => _userCache.GetListValueType<SplitTunnelingFolder>(SettingEncryption.Unencrypted) ?? DefaultSettings.SplitTunnelingFoldersList;
+        set => _userCache.SetListValueType<SplitTunnelingFolder>(value, SettingEncryption.Unencrypted);
+    }
+
+    public List<SplitTunnelingFolder> SplitTunnelingInverseFoldersList
+    {
+        get => _userCache.GetListValueType<SplitTunnelingFolder>(SettingEncryption.Unencrypted) ?? DefaultSettings.SplitTunnelingFoldersList;
+        set => _userCache.SetListValueType<SplitTunnelingFolder>(value, SettingEncryption.Unencrypted);
+    }
+
     public List<string> Ipv6Fragments
     {
         get => _userCache.GetListReferenceType<string>(SettingEncryption.Unencrypted) ?? DefaultSettings.Ipv6Fragments;
diff --git a/src/ProcessCommunication/ProtonVPN.ProcessCommunication.Contracts/Controllers/IVpnController.cs b/src/ProcessCommunication/ProtonVPN.ProcessCommunication.Contracts/Controllers/IVpnController.cs
index 0ce390a2f..0d327ce7a 100644
--- a/src/ProcessCommunication/ProtonVPN.ProcessCommunication.Contracts/Controllers/IVpnController.cs
+++ b/src/ProcessCommunication/ProtonVPN.ProcessCommunication.Contracts/Controllers/IVpnController.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) 2026 Proton AG
  *
  * This file is part of ProtonVPN.
@@ -38,4 +38,7 @@ public interface IVpnController : IServiceController
 
     Task RequestNetShieldStats(CancellationToken cancelToken);
     Task RequestConnectionDetails(CancellationToken cancelToken);
+
+    Task AddAppPathsDynamically(DynamicAppPathsIpcEntity appPathsEntity, CancellationToken cancelToken);
+    Task RemoveAppPathsDynamically(DynamicAppPathsIpcEntity appPathsEntity, CancellationToken cancelToken);
 }
\ No newline at end of file
diff --git a/src/ProcessCommunication/ProtonVPN.ProcessCommunication.Contracts/Entities/Settings/DynamicAppPathsIpcEntity.cs b/src/ProcessCommunication/ProtonVPN.ProcessCommunication.Contracts/Entities/Settings/DynamicAppPathsIpcEntity.cs
new file mode 100644
index 000000000..b1fb1ec67
--- /dev/null
+++ b/src/ProcessCommunication/ProtonVPN.ProcessCommunication.Contracts/Entities/Settings/DynamicAppPathsIpcEntity.cs
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2026 Proton AG
+ *
+ * This file is part of ProtonVPN.
+ *
+ * ProtonVPN is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * ProtonVPN is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with ProtonVPN.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+using System.Runtime.Serialization;
+
+namespace ProtonVPN.ProcessCommunication.Contracts.Entities.Settings;
+
+[DataContract]
+public class DynamicAppPathsIpcEntity
+{
+    [DataMember]
+    public string[] AppPaths { get; set; } = [];
+}
diff --git a/src/ProtonVPN.Service/SplitTunneling/ISplitTunnelClient.cs b/src/ProtonVPN.Service/SplitTunneling/ISplitTunnelClient.cs
index 4ca69baa8..e6512abf5 100644
--- a/src/ProtonVPN.Service/SplitTunneling/ISplitTunnelClient.cs
+++ b/src/ProtonVPN.Service/SplitTunneling/ISplitTunnelClient.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) 2025 Proton AG
  *
  * This file is part of ProtonVPN.
@@ -28,4 +28,8 @@ public interface ISplitTunnelClient
     void EnableIncludeMode(string[] appPaths, IPAddress serverIpv4Address, IPAddress serverIpv6Address);
 
     void Disable();
+
+    void AddAppPathsDynamically(string[] appPaths);
+
+    void RemoveAppPathsDynamically(string[] appPaths);
 }
\ No newline at end of file
diff --git a/src/ProtonVPN.Service/SplitTunneling/SplitTunnelClient.cs b/src/ProtonVPN.Service/SplitTunneling/SplitTunnelClient.cs
index b2e12aabd..2d68d408c 100644
--- a/src/ProtonVPN.Service/SplitTunneling/SplitTunnelClient.cs
+++ b/src/ProtonVPN.Service/SplitTunneling/SplitTunnelClient.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) 2025 Proton AG
  *
  * This file is part of ProtonVPN.
@@ -68,6 +68,30 @@ public void Disable()
         EnsureSucceeded(_filters.Disable, "SplitTunnel: Disabling");
     }
 
+    public void AddAppPathsDynamically(string[] appPaths)
+    {
+        if (appPaths == null || appPaths.Length == 0)
+        {
+            return;
+        }
+
+        EnsureSucceeded(
+            () => _filters.AddAppPathsDynamically(appPaths),
+            "SplitTunnel: Adding app paths dynamically");
+    }
+
+    public void RemoveAppPathsDynamically(string[] appPaths)
+    {
+        if (appPaths == null || appPaths.Length == 0)
+        {
+            return;
+        }
+
+        EnsureSucceeded(
+            () => _filters.RemoveAppPathsDynamically(appPaths),
+            "SplitTunnel: Removing app paths dynamically");
+    }
+
     private void EnsureSucceeded(System.Action action, string actionMessage)
     {
         try
diff --git a/src/ProtonVPN.Service/SplitTunneling/SplitTunnelNetworkFilters.cs b/src/ProtonVPN.Service/SplitTunneling/SplitTunnelNetworkFilters.cs
index 496ff99e6..b5cdfedae 100644
--- a/src/ProtonVPN.Service/SplitTunneling/SplitTunnelNetworkFilters.cs
+++ b/src/ProtonVPN.Service/SplitTunneling/SplitTunnelNetworkFilters.cs
@@ -35,6 +35,15 @@ public class SplitTunnelNetworkFilters
     private IpFilter _ipFilter;
     private Sublayer _subLayer;
 
+    private bool _isActive;
+    private Callout _connectRedirectCalloutV4;
+    private Callout _bindRedirectCalloutV4;
+    private ProviderContext _providerContextV4;
+    private Callout _connectRedirectCalloutV6;
+    private Callout _bindRedirectCalloutV6;
+    private ProviderContext _providerContextV6;
+    private readonly System.Collections.Generic.Dictionary<string, System.Collections.Generic.List<Guid>> _appFilterIds = new(StringComparer.OrdinalIgnoreCase);
+
     public void EnableExcludeMode(string[] apps, IPAddress localIpv4Address, IPAddress localIpv6Address)
     {
         Create();
@@ -71,23 +80,75 @@ public void EnableIncludeMode(string[] apps, IPAddress serverIpv4Address, IPAddr
         }
     }
 
+    public void AddAppPathsDynamically(string[] apps)
+    {
+        if (!_isActive || _ipFilter == null || _subLayer == null) return;
+
+        _ipFilter.Session.StartTransaction();
+        try
+        {
+            CreateAppCalloutFilters(apps, _bindRedirectCalloutV4, Layer.BindRedirectV4, _providerContextV4);
+            CreateAppCalloutFilters(apps, _connectRedirectCalloutV4, Layer.AppConnectRedirectV4, _providerContextV4);
+
+            if (_bindRedirectCalloutV6 != null && _connectRedirectCalloutV6 != null && _providerContextV6 != null)
+            {
+                CreateAppCalloutFilters(apps, _connectRedirectCalloutV6, Layer.AppConnectRedirectV6, _providerContextV6);
+                CreateAppCalloutFilters(apps, _bindRedirectCalloutV6, Layer.BindRedirectV6, _providerContextV6);
+            }
+
+            _ipFilter.Session.CommitTransaction();
+        }
+        catch
+        {
+            _ipFilter.Session.AbortTransaction();
+            throw;
+        }
+    }
+
+    public void RemoveAppPathsDynamically(string[] apps)
+    {
+        if (!_isActive || _ipFilter == null || _subLayer == null) return;
+
+        _ipFilter.Session.StartTransaction();
+        try
+        {
+            foreach (string app in apps)
+            {
+                if (_appFilterIds.TryGetValue(app, out System.Collections.Generic.List<Guid> filterIds))
+                {
+                    foreach (Guid filterId in filterIds)
+                    {
+                        _subLayer.DestroyFilter(filterId);
+                    }
+                    _appFilterIds.Remove(app);
+                }
+            }
+            _ipFilter.Session.CommitTransaction();
+        }
+        catch
+        {
+            _ipFilter.Session.AbortTransaction();
+            throw;
+        }
+    }
+
     private void Redirect(string[] apps, IPAddress ipv4Address, IPAddress ipv6Address)
     {
-        Callout connectRedirectCalloutV4 = CreateConnectRedirectCallout(Layer.AppConnectRedirectV4, _connectRedirectV4CalloutKey);
-        Callout bindRedirectCalloutV4 = CreateUDPRedirectCallout(Layer.BindRedirectV4, _bindRedirectV4CalloutKey);
+        _connectRedirectCalloutV4 = CreateConnectRedirectCallout(Layer.AppConnectRedirectV4, _connectRedirectV4CalloutKey);
+        _bindRedirectCalloutV4 = CreateUDPRedirectCallout(Layer.BindRedirectV4, _bindRedirectV4CalloutKey);
 
-        ProviderContext providerContextV4 = GetProviderContext(ipv4Address);
-        CreateAppCalloutFilters(apps, bindRedirectCalloutV4, Layer.BindRedirectV4, providerContextV4);
-        CreateAppCalloutFilters(apps, connectRedirectCalloutV4, Layer.AppConnectRedirectV4, providerContextV4);
+        _providerContextV4 = GetProviderContext(ipv4Address);
+        CreateAppCalloutFilters(apps, _bindRedirectCalloutV4, Layer.BindRedirectV4, _providerContextV4);
+        CreateAppCalloutFilters(apps, _connectRedirectCalloutV4, Layer.AppConnectRedirectV4, _providerContextV4);
 
         if (ipv6Address is not null)
         {
-            ProviderContext providerContextV6 = GetProviderContext(ipv6Address);
-            Callout connectRedirectCalloutV6 = CreateConnectRedirectCallout(Layer.AppConnectRedirectV6, _connectRedirectV6CalloutKey);
-            Callout redirectUDPCalloutV6 = CreateUDPRedirectCallout(Layer.BindRedirectV6, _bindRedirectV6CalloutKey);
+            _providerContextV6 = GetProviderContext(ipv6Address);
+            _connectRedirectCalloutV6 = CreateConnectRedirectCallout(Layer.AppConnectRedirectV6, _connectRedirectV6CalloutKey);
+            _bindRedirectCalloutV6 = CreateUDPRedirectCallout(Layer.BindRedirectV6, _bindRedirectV6CalloutKey);
 
-            CreateAppCalloutFilters(apps, connectRedirectCalloutV6, Layer.AppConnectRedirectV6, providerContextV6);
-            CreateAppCalloutFilters(apps, redirectUDPCalloutV6, Layer.BindRedirectV6, providerContextV6);
+            CreateAppCalloutFilters(apps, _connectRedirectCalloutV6, Layer.AppConnectRedirectV6, _providerContextV6);
+            CreateAppCalloutFilters(apps, _bindRedirectCalloutV6, Layer.BindRedirectV6, _providerContextV6);
         }
     }
 
@@ -109,6 +170,9 @@ public void Disable()
 
     private void Create()
     {
+        _appFilterIds.Clear();
+        _isActive = true;
+
         _ipFilter = IpFilter.Create(
             Session.Dynamic(),
             new DisplayData { Name = "Proton AG", Description = "ProtonVPN Split Tunnel provider" });
@@ -123,6 +187,15 @@ private void Remove()
         _ipFilter?.Session.Close();
         _ipFilter = null;
         _subLayer = null;
+
+        _isActive = false;
+        _appFilterIds.Clear();
+        _connectRedirectCalloutV4 = null;
+        _bindRedirectCalloutV4 = null;
+        _providerContextV4 = null;
+        _connectRedirectCalloutV6 = null;
+        _bindRedirectCalloutV6 = null;
+        _providerContextV6 = null;
     }
 
     private void CreateAppCalloutFilters(string[] apps, Callout callout, Layer layer, ProviderContext providerContext)
@@ -137,16 +210,24 @@ private void SafeCreateAppFilter(string app, Callout callout, Layer layer, Provi
     {
         try
         {
-            CreateAppFilter(app, callout, layer, providerContext);
+            Guid filterId = CreateAppFilter(app, callout, layer, providerContext);
+
+            if (!_appFilterIds.TryGetValue(app, out System.Collections.Generic.List<Guid> ids))
+            {
+                ids = new System.Collections.Generic.List<Guid>();
+                _appFilterIds[app] = ids;
+            }
+            
+            ids.Add(filterId);
         }
         catch (NetworkFilterException)
         {
         }
     }
 
-    private void CreateAppFilter(string app, Callout callout, Layer layer, ProviderContext providerContext)
+    private Guid CreateAppFilter(string app, Callout callout, Layer layer, ProviderContext providerContext)
     {
-        _subLayer.CreateAppCalloutFilter(
+        return _subLayer.CreateAppCalloutFilter(
             new DisplayData
             {
                 Name = "ProtonVPN Split Tunnel redirect app",
diff --git a/src/ProtonVPN.Service/VpnController.cs b/src/ProtonVPN.Service/VpnController.cs
index 2ba7badd8..0137cc897 100644
--- a/src/ProtonVPN.Service/VpnController.cs
+++ b/src/ProtonVPN.Service/VpnController.cs
@@ -35,6 +35,7 @@
 using ProtonVPN.Service.ControllerRetries;
 using ProtonVPN.Service.ProcessCommunication;
 using ProtonVPN.Service.Settings;
+using ProtonVPN.Service.SplitTunneling;
 using ProtonVPN.Vpn.Common;
 using ProtonVPN.Vpn.LocalAgent;
 using ProtonVPN.Vpn.PortMapping;
@@ -52,6 +53,7 @@ public class VpnController : IVpnController
     private readonly IEntityMapper _entityMapper;
     private readonly ILocalAgentTlsCredentialsCache _localAgentTlsCredentialsCache;
     private readonly IControllerRetryManager _controllerRetryManager;
+    private readonly ISplitTunnelClient _splitTunnelClient;
 
     public VpnController(
         IVpnConnection vpnConnection,
@@ -62,7 +64,8 @@ public VpnController(
         IClientControllerSender appControllerCaller,
         IEntityMapper entityMapper,
         ILocalAgentTlsCredentialsCache localAgentTlsCredentialsCache,
-        IControllerRetryManager controllerRetryManager)
+        IControllerRetryManager controllerRetryManager,
+        ISplitTunnelClient splitTunnelClient)
     {
         _vpnConnection = vpnConnection;
         _logger = logger;
@@ -73,6 +76,7 @@ public VpnController(
         _entityMapper = entityMapper;
         _localAgentTlsCredentialsCache = localAgentTlsCredentialsCache;
         _controllerRetryManager = controllerRetryManager;
+        _splitTunnelClient = splitTunnelClient;
     }
 
     public async Task Connect(ConnectionRequestIpcEntity connectionRequest, CancellationToken cancelToken)
@@ -143,4 +147,14 @@ public async Task RequestConnectionDetails(CancellationToken cancelToken)
     {
         _vpnConnection.RequestConnectionDetails();
     }
+
+    public async Task AddAppPathsDynamically(DynamicAppPathsIpcEntity appPathsEntity, CancellationToken cancelToken)
+    {
+        _splitTunnelClient.AddAppPathsDynamically(appPathsEntity.AppPaths ?? System.Array.Empty<string>());
+    }
+
+    public async Task RemoveAppPathsDynamically(DynamicAppPathsIpcEntity appPathsEntity, CancellationToken cancelToken)
+    {
+        _splitTunnelClient.RemoveAppPathsDynamically(appPathsEntity.AppPaths ?? System.Array.Empty<string>());
+    }
 }
\ No newline at end of file