Fix double navigation issue

Jack251970 · Jack251970 · commit d0e799b8edaf · 2025-05-15T20:16:50.000+08:00
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml.cs b/Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml.cs
@@ -8,24 +8,24 @@ namespace Flow.Launcher.SettingPages.Views;
 public partial class SettingsPaneAbout
 {
     private SettingsPaneAboutViewModel _viewModel = null!;
-    private SettingWindowViewModel _settingViewModel = null;
+    private readonly SettingWindowViewModel _settingViewModel = Ioc.Default.GetRequiredService<SettingWindowViewModel>();
 
     protected override void OnNavigatedTo(NavigationEventArgs e)
     {
+        // Sometimes the navigation is not triggered by button click,
+        // so we need to reset the page type
+        _settingViewModel.PageType = typeof(SettingsPaneAbout);
+
         // If the navigation is not triggered by button click, view model will be null again
         if (_viewModel == null)
         {
             _viewModel = Ioc.Default.GetRequiredService<SettingsPaneAboutViewModel>();
-            _settingViewModel = Ioc.Default.GetRequiredService<SettingWindowViewModel>();
             DataContext = _viewModel;
         }
         if (!IsInitialized)
         {
             InitializeComponent();
         }
-        // Sometimes the navigation is not triggered by button click,
-        // so we need to reset the page type
-        _settingViewModel.PageType = typeof(SettingsPaneAbout);
         base.OnNavigatedTo(e);
     }
 
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml.cs b/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml.cs
@@ -8,24 +8,24 @@ namespace Flow.Launcher.SettingPages.Views;
 public partial class SettingsPaneGeneral
 {
     private SettingsPaneGeneralViewModel _viewModel = null!;
-    private SettingWindowViewModel _settingViewModel = null;
+    private readonly SettingWindowViewModel _settingViewModel = Ioc.Default.GetRequiredService<SettingWindowViewModel>();
 
     protected override void OnNavigatedTo(NavigationEventArgs e)
     {
+        // Sometimes the navigation is not triggered by button click,
+        // so we need to reset the page type
+        _settingViewModel.PageType = typeof(SettingsPaneGeneral);
+
         // If the navigation is not triggered by button click, view model will be null again
         if (_viewModel == null)
         {
             _viewModel = Ioc.Default.GetRequiredService<SettingsPaneGeneralViewModel>();
-            _settingViewModel = Ioc.Default.GetRequiredService<SettingWindowViewModel>();
             DataContext = _viewModel;
         }
         if (!IsInitialized)
         {
             InitializeComponent();
         }
-        // Sometimes the navigation is not triggered by button click,
-        // so we need to reset the page type
-        _settingViewModel.PageType = typeof(SettingsPaneGeneral);
         base.OnNavigatedTo(e);
     }
 }
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneHotkey.xaml.cs b/Flow.Launcher/SettingPages/Views/SettingsPaneHotkey.xaml.cs
@@ -8,24 +8,24 @@ namespace Flow.Launcher.SettingPages.Views;
 public partial class SettingsPaneHotkey
 {
     private SettingsPaneHotkeyViewModel _viewModel = null!;
-    private SettingWindowViewModel _settingViewModel = null;
+    private readonly SettingWindowViewModel _settingViewModel = Ioc.Default.GetRequiredService<SettingWindowViewModel>();
 
     protected override void OnNavigatedTo(NavigationEventArgs e)
     {
+        // Sometimes the navigation is not triggered by button click,
+        // so we need to reset the page type
+        _settingViewModel.PageType = typeof(SettingsPaneHotkey);
+
         // If the navigation is not triggered by button click, view model will be null again
         if (_viewModel == null)
         {
             _viewModel = Ioc.Default.GetRequiredService<SettingsPaneHotkeyViewModel>();
-            _settingViewModel = Ioc.Default.GetRequiredService<SettingWindowViewModel>();
             DataContext = _viewModel;
         }
         if (!IsInitialized)
         {
             InitializeComponent();
         }
-        // Sometimes the navigation is not triggered by button click,
-        // so we need to reset the page type
-        _settingViewModel.PageType = typeof(SettingsPaneHotkey);
         base.OnNavigatedTo(e);
     }
 }
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPanePluginStore.xaml.cs b/Flow.Launcher/SettingPages/Views/SettingsPanePluginStore.xaml.cs
@@ -11,25 +11,25 @@ namespace Flow.Launcher.SettingPages.Views;
 public partial class SettingsPanePluginStore
 {
     private SettingsPanePluginStoreViewModel _viewModel = null!;
-    private SettingWindowViewModel _settingViewModel = null;
+    private readonly SettingWindowViewModel _settingViewModel = Ioc.Default.GetRequiredService<SettingWindowViewModel>();
 
     protected override void OnNavigatedTo(NavigationEventArgs e)
     {
+        // Sometimes the navigation is not triggered by button click,
+        // so we need to reset the page type
+        _settingViewModel.PageType = typeof(SettingsPanePluginStore);
+
         // If the navigation is not triggered by button click, view model will be null again
         if (_viewModel == null)
         {
             _viewModel = Ioc.Default.GetRequiredService<SettingsPanePluginStoreViewModel>();
-            _settingViewModel = Ioc.Default.GetRequiredService<SettingWindowViewModel>();
             DataContext = _viewModel;
         }
         if (!IsInitialized)
         {
             InitializeComponent();
         }
         _viewModel.PropertyChanged += ViewModel_PropertyChanged;
-        // Sometimes the navigation is not triggered by button click,
-        // so we need to reset the page type
-        _settingViewModel.PageType = typeof(SettingsPanePluginStore);
         base.OnNavigatedTo(e);
     }
 
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPanePlugins.xaml.cs b/Flow.Launcher/SettingPages/Views/SettingsPanePlugins.xaml.cs
@@ -11,25 +11,25 @@ namespace Flow.Launcher.SettingPages.Views;
 public partial class SettingsPanePlugins
 {
     private SettingsPanePluginsViewModel _viewModel = null!;
-    private SettingWindowViewModel _settingViewModel = null;
+    private readonly SettingWindowViewModel _settingViewModel = Ioc.Default.GetRequiredService<SettingWindowViewModel>();
 
     protected override void OnNavigatedTo(NavigationEventArgs e)
     {
+        // Sometimes the navigation is not triggered by button click,
+        // so we need to reset the page type
+        _settingViewModel.PageType = typeof(SettingsPanePlugins);
+
         // If the navigation is not triggered by button click, view model will be null again
         if (_viewModel == null)
         {
             _viewModel = Ioc.Default.GetRequiredService<SettingsPanePluginsViewModel>();
-            _settingViewModel = Ioc.Default.GetRequiredService<SettingWindowViewModel>();
             DataContext = _viewModel;
         }
         if (!IsInitialized)
         {
             InitializeComponent();
         }
         _viewModel.PropertyChanged += ViewModel_PropertyChanged;
-        // Sometimes the navigation is not triggered by button click,
-        // so we need to reset the page type
-        _settingViewModel.PageType = typeof(SettingsPanePlugins);
         base.OnNavigatedTo(e);
     }
 
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneProxy.xaml.cs b/Flow.Launcher/SettingPages/Views/SettingsPaneProxy.xaml.cs
@@ -8,24 +8,24 @@ namespace Flow.Launcher.SettingPages.Views;
 public partial class SettingsPaneProxy
 {
     private SettingsPaneProxyViewModel _viewModel = null!;
-    private SettingWindowViewModel _settingViewModel = null;
+    private readonly SettingWindowViewModel _settingViewModel = Ioc.Default.GetRequiredService<SettingWindowViewModel>();
 
     protected override void OnNavigatedTo(NavigationEventArgs e)
     {
+        // Sometimes the navigation is not triggered by button click,
+        // so we need to reset the page type
+        _settingViewModel.PageType = typeof(SettingsPaneProxy);
+
         // If the navigation is not triggered by button click, view model will be null again
         if (_viewModel == null)
         {
             _viewModel = Ioc.Default.GetRequiredService<SettingsPaneProxyViewModel>();
-            _settingViewModel = Ioc.Default.GetRequiredService<SettingWindowViewModel>();
             DataContext = _viewModel;
         }
         if (!IsInitialized)
         {
             InitializeComponent();
         }
-        // Sometimes the navigation is not triggered by button click,
-        // so we need to reset the page type
-        _settingViewModel.PageType = typeof(SettingsPaneProxy);
         base.OnNavigatedTo(e);
     }
 }
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml.cs b/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml.cs
@@ -8,24 +8,24 @@ namespace Flow.Launcher.SettingPages.Views;
 public partial class SettingsPaneTheme
 {
     private SettingsPaneThemeViewModel _viewModel = null!;
-    private SettingWindowViewModel _settingViewModel = null;
+    private readonly SettingWindowViewModel _settingViewModel = Ioc.Default.GetRequiredService<SettingWindowViewModel>();
 
     protected override void OnNavigatedTo(NavigationEventArgs e)
     {
+        // Sometimes the navigation is not triggered by button click,
+        // so we need to reset the page type
+        _settingViewModel.PageType = typeof(SettingsPaneTheme);
+
         // If the navigation is not triggered by button click, view model will be null again
         if (_viewModel == null)
         {
             _viewModel = Ioc.Default.GetRequiredService<SettingsPaneThemeViewModel>();
-            _settingViewModel = Ioc.Default.GetRequiredService<SettingWindowViewModel>();
             DataContext = _viewModel;
         }
         if (!IsInitialized)
         {
             InitializeComponent();
         }
-        // Sometimes the navigation is not triggered by button click,
-        // so we need to reset the page type
-        _settingViewModel.PageType = typeof(SettingsPaneTheme);
         base.OnNavigatedTo(e);
     }
 }
diff --git a/Flow.Launcher/SettingWindow.xaml.cs b/Flow.Launcher/SettingWindow.xaml.cs
@@ -241,6 +241,7 @@ private void NavigationView_SelectionChanged(NavigationView sender, NavigationVi
     {
         if (args.IsSettingsSelected)
         {
+            _viewModel.SetPageType(typeof(SettingsPaneGeneral));
             ContentFrame.Navigate(typeof(SettingsPaneGeneral));
         }
         else
@@ -263,8 +264,11 @@ private void NavigationView_SelectionChanged(NavigationView sender, NavigationVi
                 nameof(About) => typeof(SettingsPaneAbout),
                 _ => typeof(SettingsPaneGeneral)
             };
-            _viewModel.SetPageType(pageType);
-            ContentFrame.Navigate(pageType);
+            // Only navigate if the page type changes to fix navigation forward/back issue
+            if (_viewModel.SetPageType(pageType))
+            {
+                ContentFrame.Navigate(pageType);
+            }
         }
     }
 
@@ -282,7 +286,8 @@ private void NavView_Loaded(object sender, RoutedEventArgs e)
 
     private void ContentFrame_Loaded(object sender, RoutedEventArgs e)
     {
-        NavView.SelectedItem ??= NavView.MenuItems[0]; /* Set First Page */
+        _viewModel.SetPageType(null); // Set page type to null so that NavigationView_SelectionChanged can navigate the frame
+        NavView.SelectedItem = NavView.MenuItems[0]; /* Set First Page */
     }
 
     #endregion
diff --git a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
@@ -1,7 +1,6 @@
 ﻿using System;
 using Flow.Launcher.Infrastructure.UserSettings;
 using Flow.Launcher.Plugin;
-using Flow.Launcher.SettingPages.Views;
 
 namespace Flow.Launcher.ViewModel;
 
@@ -14,12 +13,15 @@ public SettingWindowViewModel(Settings settings)
         _settings = settings;
     }
 
-    public void SetPageType(Type pageType)
+    public bool SetPageType(Type pageType)
     {
+        if (_pageType == pageType) return false;
+
         _pageType = pageType;
+        return true;
     }
 
-    private Type _pageType = typeof(SettingsPaneGeneral);
+    private Type _pageType = null;
     public Type PageType
     {
         get => _pageType;

Original file line number	Diff line number	Diff line change
`@@ -8,24 +8,24 @@ namespace Flow.Launcher.SettingPages.Views;`
`8`	`8`	`public partial class SettingsPaneAbout`
`9`	`9`	`{`
`10`	`10`	`private SettingsPaneAboutViewModel _viewModel = null!;`
`11`		`- private SettingWindowViewModel _settingViewModel = null;`
	`11`	`+ private readonly SettingWindowViewModel _settingViewModel = Ioc.Default.GetRequiredService<SettingWindowViewModel>();`
`12`	`12`
`13`	`13`	`protected override void OnNavigatedTo(NavigationEventArgs e)`
`14`	`14`	`{`
	`15`	`+ // Sometimes the navigation is not triggered by button click,`
	`16`	`+ // so we need to reset the page type`
	`17`	`+ _settingViewModel.PageType = typeof(SettingsPaneAbout);`
	`18`	`+`
`15`	`19`	`// If the navigation is not triggered by button click, view model will be null again`
`16`	`20`	`if (_viewModel == null)`
`17`	`21`	`{`
`18`	`22`	`_viewModel = Ioc.Default.GetRequiredService<SettingsPaneAboutViewModel>();`
`19`		`- _settingViewModel = Ioc.Default.GetRequiredService<SettingWindowViewModel>();`
`20`	`23`	`DataContext = _viewModel;`
`21`	`24`	`}`
`22`	`25`	`if (!IsInitialized)`
`23`	`26`	`{`
`24`	`27`	`InitializeComponent();`
`25`	`28`	`}`
`26`		`- // Sometimes the navigation is not triggered by button click,`
`27`		`- // so we need to reset the page type`
`28`		`- _settingViewModel.PageType = typeof(SettingsPaneAbout);`
`29`	`29`	`base.OnNavigatedTo(e);`
`30`	`30`	`}`
`31`	`31`
Original file line number	Diff line number	Diff line change
`@@ -8,24 +8,24 @@ namespace Flow.Launcher.SettingPages.Views;`
`8`	`8`	`public partial class SettingsPaneGeneral`
`9`	`9`	`{`
`10`	`10`	`private SettingsPaneGeneralViewModel _viewModel = null!;`
`11`		`- private SettingWindowViewModel _settingViewModel = null;`
	`11`	`+ private readonly SettingWindowViewModel _settingViewModel = Ioc.Default.GetRequiredService<SettingWindowViewModel>();`
`12`	`12`
`13`	`13`	`protected override void OnNavigatedTo(NavigationEventArgs e)`
`14`	`14`	`{`
	`15`	`+ // Sometimes the navigation is not triggered by button click,`
	`16`	`+ // so we need to reset the page type`
	`17`	`+ _settingViewModel.PageType = typeof(SettingsPaneGeneral);`
	`18`	`+`
`15`	`19`	`// If the navigation is not triggered by button click, view model will be null again`
`16`	`20`	`if (_viewModel == null)`
`17`	`21`	`{`
`18`	`22`	`_viewModel = Ioc.Default.GetRequiredService<SettingsPaneGeneralViewModel>();`
`19`		`- _settingViewModel = Ioc.Default.GetRequiredService<SettingWindowViewModel>();`
`20`	`23`	`DataContext = _viewModel;`
`21`	`24`	`}`
`22`	`25`	`if (!IsInitialized)`
`23`	`26`	`{`
`24`	`27`	`InitializeComponent();`
`25`	`28`	`}`
`26`		`- // Sometimes the navigation is not triggered by button click,`
`27`		`- // so we need to reset the page type`
`28`		`- _settingViewModel.PageType = typeof(SettingsPaneGeneral);`
`29`	`29`	`base.OnNavigatedTo(e);`
`30`	`30`	`}`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,24 +8,24 @@ namespace Flow.Launcher.SettingPages.Views;`
`8`	`8`	`public partial class SettingsPaneHotkey`
`9`	`9`	`{`
`10`	`10`	`private SettingsPaneHotkeyViewModel _viewModel = null!;`
`11`		`- private SettingWindowViewModel _settingViewModel = null;`
	`11`	`+ private readonly SettingWindowViewModel _settingViewModel = Ioc.Default.GetRequiredService<SettingWindowViewModel>();`
`12`	`12`
`13`	`13`	`protected override void OnNavigatedTo(NavigationEventArgs e)`
`14`	`14`	`{`
	`15`	`+ // Sometimes the navigation is not triggered by button click,`
	`16`	`+ // so we need to reset the page type`
	`17`	`+ _settingViewModel.PageType = typeof(SettingsPaneHotkey);`
	`18`	`+`
`15`	`19`	`// If the navigation is not triggered by button click, view model will be null again`
`16`	`20`	`if (_viewModel == null)`
`17`	`21`	`{`
`18`	`22`	`_viewModel = Ioc.Default.GetRequiredService<SettingsPaneHotkeyViewModel>();`
`19`		`- _settingViewModel = Ioc.Default.GetRequiredService<SettingWindowViewModel>();`
`20`	`23`	`DataContext = _viewModel;`
`21`	`24`	`}`
`22`	`25`	`if (!IsInitialized)`
`23`	`26`	`{`
`24`	`27`	`InitializeComponent();`
`25`	`28`	`}`
`26`		`- // Sometimes the navigation is not triggered by button click,`
`27`		`- // so we need to reset the page type`
`28`		`- _settingViewModel.PageType = typeof(SettingsPaneHotkey);`
`29`	`29`	`base.OnNavigatedTo(e);`
`30`	`30`	`}`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,25 +11,25 @@ namespace Flow.Launcher.SettingPages.Views;`
`11`	`11`	`public partial class SettingsPanePluginStore`
`12`	`12`	`{`
`13`	`13`	`private SettingsPanePluginStoreViewModel _viewModel = null!;`
`14`		`- private SettingWindowViewModel _settingViewModel = null;`
	`14`	`+ private readonly SettingWindowViewModel _settingViewModel = Ioc.Default.GetRequiredService<SettingWindowViewModel>();`
`15`	`15`
`16`	`16`	`protected override void OnNavigatedTo(NavigationEventArgs e)`
`17`	`17`	`{`
	`18`	`+ // Sometimes the navigation is not triggered by button click,`
	`19`	`+ // so we need to reset the page type`
	`20`	`+ _settingViewModel.PageType = typeof(SettingsPanePluginStore);`
	`21`	`+`
`18`	`22`	`// If the navigation is not triggered by button click, view model will be null again`
`19`	`23`	`if (_viewModel == null)`
`20`	`24`	`{`
`21`	`25`	`_viewModel = Ioc.Default.GetRequiredService<SettingsPanePluginStoreViewModel>();`
`22`		`- _settingViewModel = Ioc.Default.GetRequiredService<SettingWindowViewModel>();`
`23`	`26`	`DataContext = _viewModel;`
`24`	`27`	`}`
`25`	`28`	`if (!IsInitialized)`
`26`	`29`	`{`
`27`	`30`	`InitializeComponent();`
`28`	`31`	`}`
`29`	`32`	`_viewModel.PropertyChanged += ViewModel_PropertyChanged;`
`30`		`- // Sometimes the navigation is not triggered by button click,`
`31`		`- // so we need to reset the page type`
`32`		`- _settingViewModel.PageType = typeof(SettingsPanePluginStore);`
`33`	`33`	`base.OnNavigatedTo(e);`
`34`	`34`	`}`
`35`	`35`
Original file line number	Diff line number	Diff line change
`@@ -8,24 +8,24 @@ namespace Flow.Launcher.SettingPages.Views;`
`8`	`8`	`public partial class SettingsPaneProxy`
`9`	`9`	`{`
`10`	`10`	`private SettingsPaneProxyViewModel _viewModel = null!;`
`11`		`- private SettingWindowViewModel _settingViewModel = null;`
	`11`	`+ private readonly SettingWindowViewModel _settingViewModel = Ioc.Default.GetRequiredService<SettingWindowViewModel>();`
`12`	`12`
`13`	`13`	`protected override void OnNavigatedTo(NavigationEventArgs e)`
`14`	`14`	`{`
	`15`	`+ // Sometimes the navigation is not triggered by button click,`
	`16`	`+ // so we need to reset the page type`
	`17`	`+ _settingViewModel.PageType = typeof(SettingsPaneProxy);`
	`18`	`+`
`15`	`19`	`// If the navigation is not triggered by button click, view model will be null again`
`16`	`20`	`if (_viewModel == null)`
`17`	`21`	`{`
`18`	`22`	`_viewModel = Ioc.Default.GetRequiredService<SettingsPaneProxyViewModel>();`
`19`		`- _settingViewModel = Ioc.Default.GetRequiredService<SettingWindowViewModel>();`
`20`	`23`	`DataContext = _viewModel;`
`21`	`24`	`}`
`22`	`25`	`if (!IsInitialized)`
`23`	`26`	`{`
`24`	`27`	`InitializeComponent();`
`25`	`28`	`}`
`26`		`- // Sometimes the navigation is not triggered by button click,`
`27`		`- // so we need to reset the page type`
`28`		`- _settingViewModel.PageType = typeof(SettingsPaneProxy);`
`29`	`29`	`base.OnNavigatedTo(e);`
`30`	`30`	`}`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,24 +8,24 @@ namespace Flow.Launcher.SettingPages.Views;`
`8`	`8`	`public partial class SettingsPaneTheme`
`9`	`9`	`{`
`10`	`10`	`private SettingsPaneThemeViewModel _viewModel = null!;`
`11`		`- private SettingWindowViewModel _settingViewModel = null;`
	`11`	`+ private readonly SettingWindowViewModel _settingViewModel = Ioc.Default.GetRequiredService<SettingWindowViewModel>();`
`12`	`12`
`13`	`13`	`protected override void OnNavigatedTo(NavigationEventArgs e)`
`14`	`14`	`{`
	`15`	`+ // Sometimes the navigation is not triggered by button click,`
	`16`	`+ // so we need to reset the page type`
	`17`	`+ _settingViewModel.PageType = typeof(SettingsPaneTheme);`
	`18`	`+`
`15`	`19`	`// If the navigation is not triggered by button click, view model will be null again`
`16`	`20`	`if (_viewModel == null)`
`17`	`21`	`{`
`18`	`22`	`_viewModel = Ioc.Default.GetRequiredService<SettingsPaneThemeViewModel>();`
`19`		`- _settingViewModel = Ioc.Default.GetRequiredService<SettingWindowViewModel>();`
`20`	`23`	`DataContext = _viewModel;`
`21`	`24`	`}`
`22`	`25`	`if (!IsInitialized)`
`23`	`26`	`{`
`24`	`27`	`InitializeComponent();`
`25`	`28`	`}`
`26`		`- // Sometimes the navigation is not triggered by button click,`
`27`		`- // so we need to reset the page type`
`28`		`- _settingViewModel.PageType = typeof(SettingsPaneTheme);`
`29`	`29`	`base.OnNavigatedTo(e);`
`30`	`30`	`}`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -241,6 +241,7 @@ private void NavigationView_SelectionChanged(NavigationView sender, NavigationVi`
`241`	`241`	`{`
`242`	`242`	`if (args.IsSettingsSelected)`
`243`	`243`	`{`
	`244`	`+ _viewModel.SetPageType(typeof(SettingsPaneGeneral));`
`244`	`245`	`ContentFrame.Navigate(typeof(SettingsPaneGeneral));`
`245`	`246`	`}`
`246`	`247`	`else`
`@@ -263,8 +264,11 @@ private void NavigationView_SelectionChanged(NavigationView sender, NavigationVi`
`263`	`264`	`nameof(About) => typeof(SettingsPaneAbout),`
`264`	`265`	`_ => typeof(SettingsPaneGeneral)`
`265`	`266`	`};`
`266`		`- _viewModel.SetPageType(pageType);`
`267`		`- ContentFrame.Navigate(pageType);`
	`267`	`+ // Only navigate if the page type changes to fix navigation forward/back issue`
	`268`	`+ if (_viewModel.SetPageType(pageType))`
	`269`	`+ {`
	`270`	`+ ContentFrame.Navigate(pageType);`
	`271`	`+ }`
`268`	`272`	`}`
`269`	`273`	`}`
`270`	`274`
`@@ -282,7 +286,8 @@ private void NavView_Loaded(object sender, RoutedEventArgs e)`
`282`	`286`
`283`	`287`	`private void ContentFrame_Loaded(object sender, RoutedEventArgs e)`
`284`	`288`	`{`
`285`		`- NavView.SelectedItem ??= NavView.MenuItems[0]; /* Set First Page */`
	`289`	`+ _viewModel.SetPageType(null); // Set page type to null so that NavigationView_SelectionChanged can navigate the frame`
	`290`	`+ NavView.SelectedItem = NavView.MenuItems[0]; /* Set First Page */`
`286`	`291`	`}`
`287`	`292`
`288`	`293`	`#endregion`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`using System;`
`2`	`2`	`using Flow.Launcher.Infrastructure.UserSettings;`
`3`	`3`	`using Flow.Launcher.Plugin;`
`4`		`-using Flow.Launcher.SettingPages.Views;`
`5`	`4`
`6`	`5`	`namespace Flow.Launcher.ViewModel;`
`7`	`6`
`@@ -14,12 +13,15 @@ public SettingWindowViewModel(Settings settings)`
`14`	`13`	`_settings = settings;`
`15`	`14`	`}`
`16`	`15`
`17`		`- public void SetPageType(Type pageType)`
	`16`	`+ public bool SetPageType(Type pageType)`
`18`	`17`	`{`
	`18`	`+ if (_pageType == pageType) return false;`
	`19`	`+`
`19`	`20`	`_pageType = pageType;`
	`21`	`+ return true;`
`20`	`22`	`}`
`21`	`23`
`22`		`- private Type _pageType = typeof(SettingsPaneGeneral);`
	`24`	`+ private Type _pageType = null;`
`23`	`25`	`public Type PageType`
`24`	`26`	`{`
`25`	`27`	`get => _pageType;`