diff --git a/Wino.Mail.WinUI/Properties/launchSettings.json b/Wino.Mail.WinUI/Properties/launchSettings.json
index 14643837..52fff1db 100644
--- a/Wino.Mail.WinUI/Properties/launchSettings.json
+++ b/Wino.Mail.WinUI/Properties/launchSettings.json
@@ -3,7 +3,7 @@
     "Wino.Mail.WinUI (Package)": {
       "commandName": "MsixPackage",
       "doNotLaunchApp": false,
-      "nativeDebugging": true
+      "nativeDebugging": false
     },
     "Wino.Mail.WinUI (Unpackaged)": {
       "commandName": "Project"
diff --git a/Wino.Mail.WinUI/Views/WinoAppShell.xaml.cs b/Wino.Mail.WinUI/Views/WinoAppShell.xaml.cs
index 1ce308ed..df834607 100644
--- a/Wino.Mail.WinUI/Views/WinoAppShell.xaml.cs
+++ b/Wino.Mail.WinUI/Views/WinoAppShell.xaml.cs
@@ -187,7 +187,7 @@ public sealed partial class WinoAppShell : Views.Abstract.WinoAppShellAbstract,
 
         if (ViewModel.IsCalendarMode)
         {
-            ViewModel.StatePersistenceService.CoreWindowTitle = ViewModel.CalendarClient.HighlightedDateRange?.ToString() ?? string.Empty;
+            ViewModel.StatePersistenceService.CoreWindowTitle = ViewModel.StatePersistenceService.AppModeTitle;
             return;
         }