diff --git a/src/ElectronNET.WebApp/Program.cs b/src/ElectronNET.WebApp/Program.cs
index 6a32e60..9adf2ea 100644
--- a/src/ElectronNET.WebApp/Program.cs
+++ b/src/ElectronNET.WebApp/Program.cs
@@ -5,6 +5,9 @@ using Microsoft.Extensions.Logging;
 
 namespace ElectronNET.WebApp
 {
+    using System.Threading.Tasks;
+    using ElectronNET.API.Entities;
+
     public class Program
     {
         public static void Main(string[] args)
@@ -16,8 +19,75 @@ namespace ElectronNET.WebApp
         {
             return WebHost.CreateDefaultBuilder(args)
                 .ConfigureLogging((hostingContext, logging) => { logging.AddConsole(); })
-                .UseElectron(args)
+                .UseElectron(args, ElectronBootstrap)
                 .UseStartup<Startup>();
         }
+
+        public static async Task ElectronBootstrap()
+        {
+            //AddDevelopmentTests();
+
+            var browserWindow = await Electron.WindowManager.CreateWindowAsync(new BrowserWindowOptions
+            {
+                Width = 1152,
+                Height = 940,
+                Show = false
+            });
+
+            await browserWindow.WebContents.Session.ClearCacheAsync();
+
+            browserWindow.OnReadyToShow += () => browserWindow.Show();
+        }
+
+        private static void AddDevelopmentTests()
+        {
+            // NOTE: on mac you will need to allow the app to post notifications when asked.
+
+            _ = Electron.App.On("activate", (obj) =>
+            {
+                // obj should be a boolean that represents where there are active windows or not.
+                var hasWindows = (bool)obj;
+
+                Electron.Notification.Show(
+                    new NotificationOptions("Activate", $"activate event has been captured. Active windows = {hasWindows}")
+                    {
+                        Silent = false,
+                    });
+            });
+
+            Electron.Dock.SetMenu(new[]
+            {
+                new MenuItem
+                {
+                    Type = MenuType.normal,
+                    Label = "MenuItem",
+                    Click = () =>
+                    {
+                        Electron.Notification.Show(new NotificationOptions(
+                            "Dock MenuItem Click",
+                            "A menu item added to the Dock was selected;"));
+                    },
+                },
+                new MenuItem
+                {
+                    Type = MenuType.submenu,
+                    Label = "SubMenu",
+                    Submenu = new[]
+                    {
+                        new MenuItem
+                        {
+                            Type = MenuType.normal,
+                            Label = "Sub MenuItem",
+                            Click = () =>
+                            {
+                                Electron.Notification.Show(new NotificationOptions(
+                                    "Dock Sub MenuItem Click",
+                                    "A menu item added to the Dock was selected;"));
+                            },
+                        },
+                    }
+                }
+            });
+        }
     }
 }
diff --git a/src/ElectronNET.WebApp/Startup.cs b/src/ElectronNET.WebApp/Startup.cs
index f6c0c33..03442a5 100644
--- a/src/ElectronNET.WebApp/Startup.cs
+++ b/src/ElectronNET.WebApp/Startup.cs
@@ -1,6 +1,4 @@
-using ElectronNET.API;
-using ElectronNET.API.Entities;
-using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
@@ -40,79 +38,6 @@ namespace ElectronNET.WebApp
             {
                 endpoints.MapControllerRoute("default", "{controller=Home}/{action=Index}/{id?}");
             });
-
-            if (HybridSupport.IsElectronActive)
-            {
-                ElectronBootstrap();
-            }
-        }
-
-        public async void ElectronBootstrap()
-        {
-            //AddDevelopmentTests();
-
-            var browserWindow = await Electron.WindowManager.CreateWindowAsync(new BrowserWindowOptions
-            {
-                Width = 1152,
-                Height = 940,
-                Show = false
-            });
-
-            await browserWindow.WebContents.Session.ClearCacheAsync();
-
-            browserWindow.OnReadyToShow += () => browserWindow.Show();
-            browserWindow.SetTitle(Configuration["DemoTitleInSettings"]);
-        }
-
-        private static void AddDevelopmentTests()
-        {
-            // NOTE: on mac you will need to allow the app to post notifications when asked.
-
-            Electron.App.On("activate", (obj) =>
-            {
-                // obj should be a boolean that represents where there are active windows or not.
-                var hasWindows = (bool) obj;
-
-                Electron.Notification.Show(
-                    new NotificationOptions("Activate", $"activate event has been captured. Active windows = {hasWindows}")
-                    {
-                        Silent = false,
-                    });
-            });
-
-            Electron.Dock.SetMenu(new[]
-            {
-                new MenuItem
-                {
-                    Type = MenuType.normal,
-                    Label = "MenuItem",
-                    Click = () =>
-                    {
-                        Electron.Notification.Show(new NotificationOptions(
-                            "Dock MenuItem Click",
-                            "A menu item added to the Dock was selected;"));
-                    },
-                },
-                new MenuItem
-                {
-                    Type = MenuType.submenu,
-                    Label = "SubMenu",
-                    Submenu = new[]
-                    {
-                        new MenuItem
-                        {
-                            Type = MenuType.normal,
-                            Label = "Sub MenuItem",
-                            Click = () =>
-                            {
-                                Electron.Notification.Show(new NotificationOptions(
-                                    "Dock Sub MenuItem Click",
-                                    "A menu item added to the Dock was selected;"));
-                            },
-                        },
-                    }
-                }
-            });
         }
     }
 }