diff --git a/Passepartout/App/Constants/Theme.swift b/Passepartout/App/Constants/Theme.swift
index 3878fbd7..e3f1fac3 100644
--- a/Passepartout/App/Constants/Theme.swift
+++ b/Passepartout/App/Constants/Theme.swift
@@ -62,6 +62,7 @@ extension View {
             .listStyle(themeListStyleValue())
             .toggleStyle(themeToggleStyleValue())
             .menuStyle(.borderlessButton)
+            .withErrorHandler()
     }
 
     func themePrimaryView() -> some View {
diff --git a/Passepartout/App/PassepartoutApp.swift b/Passepartout/App/PassepartoutApp.swift
index d87165d4..a6e9bf73 100644
--- a/Passepartout/App/PassepartoutApp.swift
+++ b/Passepartout/App/PassepartoutApp.swift
@@ -34,7 +34,6 @@ struct PassepartoutApp: App {
         WindowGroup {
             MainView()
                 .withoutTitleBar()
-                .withErrorHandler()
                 .onIntentActivity(IntentDispatcher.connectVPN)
                 .onIntentActivity(IntentDispatcher.disableVPN)
                 .onIntentActivity(IntentDispatcher.enableVPN)