diff --git a/AideDeJeu/AideDeJeu.Android/MainActivity.cs b/AideDeJeu/AideDeJeu.Android/MainActivity.cs
index e45b25af..e6ef28b5 100644
--- a/AideDeJeu/AideDeJeu.Android/MainActivity.cs
+++ b/AideDeJeu/AideDeJeu.Android/MainActivity.cs
@@ -31,6 +31,7 @@ namespace AideDeJeu.Droid
             if (Rg.Plugins.Popup.Popup.SendBackPressed(base.OnBackPressed))
             {
                 // Do something if there are some pages in the `PopupStack`
+                Rg.Plugins.Popup.Services.PopupNavigation.Instance.PopAsync();
             }
             else
             {
diff --git a/AideDeJeu/AideDeJeu.UWP/App.xaml.cs b/AideDeJeu/AideDeJeu.UWP/App.xaml.cs
index 6372a76e..3e36eebd 100644
--- a/AideDeJeu/AideDeJeu.UWP/App.xaml.cs
+++ b/AideDeJeu/AideDeJeu.UWP/App.xaml.cs
@@ -54,7 +54,8 @@ namespace AideDeJeu.UWP
 
                 Rg.Plugins.Popup.Popup.Init();
 
-                Xamarin.Forms.Forms.Init(e);
+                //Xamarin.Forms.Forms.Init(e);
+                Xamarin.Forms.Forms.Init(e, Rg.Plugins.Popup.Popup.GetExtraAssemblies());
 
                 if (e.PreviousExecutionState == ApplicationExecutionState.Terminated)
                 {