diff --git a/Oqtane.Maui/App.xaml.cs b/Oqtane.Maui/App.xaml.cs
index 0d60ea85..4a344371 100644
--- a/Oqtane.Maui/App.xaml.cs
+++ b/Oqtane.Maui/App.xaml.cs
@@ -5,7 +5,10 @@ public partial class App : Application
 	public App()
 	{
 		InitializeComponent();
-
-		MainPage = new MainPage();
 	}
+
+    protected override Window CreateWindow(IActivationState? activationState)
+    {
+        return new Window(new MainPage());
+    }
 }