diff --git a/ModernKeePass/Views/MainPage.xaml.cs b/ModernKeePass/Views/MainPage.xaml.cs
index 3812f64..20c1a8c 100644
--- a/ModernKeePass/Views/MainPage.xaml.cs
+++ b/ModernKeePass/Views/MainPage.xaml.cs
@@ -55,8 +55,8 @@ namespace ModernKeePass.Views
 
         protected override void OnNavigatedFrom(NavigationEventArgs e)
         {
-            Model.Cleanup();
             base.OnNavigatedFrom(e);
+            Model.Cleanup();
         }
     }
 }