diff --git a/ModernKeePass/Pages/BasePages/LayoutAwarePageBase.cs b/ModernKeePass/Pages/BasePages/LayoutAwarePageBase.cs
index be8f8da..68c2d0f 100644
--- a/ModernKeePass/Pages/BasePages/LayoutAwarePageBase.cs
+++ b/ModernKeePass/Pages/BasePages/LayoutAwarePageBase.cs
@@ -2,8 +2,10 @@
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Data;
+using Windows.UI.Xaml.Navigation;
 using ModernKeePass.Common;
 using ModernKeePass.Interfaces;
+using ModernKeePass.ViewModels;
 
 namespace ModernKeePass.Pages.BasePages
 {
@@ -180,5 +182,28 @@ namespace ModernKeePass.Pages.BasePages
         }
 
         #endregion
+
+        #region NavigationHelper registration
+
+        /// The methods provided in this section are simply used to allow
+        /// NavigationHelper to respond to the page's navigation methods.
+        /// 
+        /// Page specific logic should be placed in event handlers for the  
+        /// <see cref="Common.NavigationHelper.LoadState"/>
+        /// and <see cref="Common.NavigationHelper.SaveState"/>.
+        /// The navigation parameter is available in the LoadState method 
+        /// in addition to page state preserved during an earlier session.
+
+        protected override void OnNavigatedTo(NavigationEventArgs e)
+        {
+            NavigationHelper.OnNavigatedTo(e);
+        }
+
+        protected override void OnNavigatedFrom(NavigationEventArgs e)
+        {
+            NavigationHelper.OnNavigatedFrom(e);
+        }
+
+        #endregion
     }
 }
diff --git a/ModernKeePass/Pages/MainPage.xaml.cs b/ModernKeePass/Pages/MainPage.xaml.cs
index 8f0536a..b024783 100644
--- a/ModernKeePass/Pages/MainPage.xaml.cs
+++ b/ModernKeePass/Pages/MainPage.xaml.cs
@@ -28,29 +28,11 @@ namespace ModernKeePass.Pages
             selectedItem?.Destination.Navigate(selectedItem.PageType, selectedItem.Parameter);
         }
         
-        #region NavigationHelper registration
-
-        /// The methods provided in this section are simply used to allow
-        /// NavigationHelper to respond to the page's navigation methods.
-        /// 
-        /// Page specific logic should be placed in event handlers for the  
-        /// <see cref="Common.NavigationHelper.LoadState"/>
-        /// and <see cref="Common.NavigationHelper.SaveState"/>.
-        /// The navigation parameter is available in the LoadState method 
-        /// in addition to page state preserved during an earlier session.
-        
         protected override void OnNavigatedTo(NavigationEventArgs e)
         {
-            NavigationHelper.OnNavigatedTo(e);
+           base.OnNavigatedTo(e);
             DataContext = new MainVm(Frame, MenuFrame);
             if (Model.SelectedItem == null) MenuFrame.Navigate(typeof(WelcomePage));
         }
-
-        protected override void OnNavigatedFrom(NavigationEventArgs e)
-        {
-            NavigationHelper.OnNavigatedFrom(e);
-        }
-
-        #endregion
     }
 }